Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
73682cb85d | ||
|
|
ac7de7a07a | ||
|
|
0bd31971a0 | ||
|
|
3010b164ab | ||
|
|
6cb4656365 | ||
|
|
272c1059ef |
No files matched your search
@@ -1,16 +1,16 @@
|
||||
# jenny's mod 2 100% real
|
||||
|
||||
mod para Minecraft Fabric 26.1.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
|
||||
mod para Minecraft Fabric 26.2 que añade algunas cosas QOL, mayormente relacionadas a la cámara.
|
||||
|
||||
## instalación
|
||||
|
||||
### para gente normal:
|
||||
1. ir a [lanzamientos](https://github.com/retuci0/sputnik/releases)
|
||||
1. ir a [lanzamientos](https://codeberg.org/retucio/sputnik/releases)
|
||||
2. selecionar la versión más reciente
|
||||
3. descargar el .jar
|
||||
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`)
|
||||
|
||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.1.2`; Fabric `0.19.2`)
|
||||
asegúrate de tener una version de Minecraft y Fabric compatibles con el mod (MC `26.2`; Fabric `0.19.3`)
|
||||
es posible que haya problemas al usarlo junto a otros mods, especialmente junto a otros clientes, pues pueden conflictar entre ellos.
|
||||
|
||||
### para frikis de 200 de iq
|
||||
@@ -56,7 +56,7 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
|
||||
<img src="screenshots/hudeditor.png" alt="editor de HUD">
|
||||
<img src="screenshots/colorpicker.png" alt="selector de colores">
|
||||
|
||||
## contibuciones
|
||||
## contribuciones
|
||||
|
||||
sí por favor
|
||||
|
||||
|
||||
+5
-17
@@ -1,29 +1,17 @@
|
||||
# v5.5
|
||||
# v6.2
|
||||
|
||||
## novedades
|
||||
|
||||
### adiciones
|
||||
|
||||
#### módulos nuevos:
|
||||
#### elementos del HUD nuevos:
|
||||
|
||||
- autoataque: mantén el botón de ataque pulsado para atacar automáticamente
|
||||
|
||||
#### comandos nuevos:
|
||||
- arraylist: lista de los módulos activados
|
||||
|
||||
### arreglos / mejoras
|
||||
|
||||
- arreglado el guardado al cerrar el juego: petaba antes de escribir nada, así que se perdía
|
||||
todo lo cambiado desde el último autoguardado y al volver a entrar salían los ajustes por defecto
|
||||
- el autoguardado cuenta desde el último guardado y no desde el último cambio, que tocando
|
||||
ajustes seguido no llegaba a guardar nunca
|
||||
- guardando dos veces seguidas ya no se descarta la segunda (era la más reciente)
|
||||
- las teclas de los módulos ya no se pisan entre ellas al cargar la config.
|
||||
- si algo falla al aplicar los ajustes ya no se queda el mod entero sin guardar
|
||||
- las listas (entidades, ítems, bloques...) se traducen al idioma del juego en vez de salir
|
||||
siempre en inglés, y se guardan por nombre interno para que no dependan del idioma
|
||||
- traducidos los títulos de los marcos, las descripciones de los módulos y los mensajes del
|
||||
arranque, que salían en español o directamente como la clave de traducción
|
||||
- añadidas las traducciones que faltaban del autoataque
|
||||
- ahora puedes hacer puentes de varios bloques de ancho con `andamios`
|
||||
- unidades distintas para el elemento del HUD `velocidad`
|
||||
|
||||
## problemas reconocidos
|
||||
|
||||
|
||||
+1
-1
@@ -10,6 +10,6 @@ discord_rpc_version=1.0.3
|
||||
neutrino_version=1.1.0
|
||||
jdk_version=25
|
||||
|
||||
mod_version=5.6
|
||||
mod_version=6.2
|
||||
maven_group=me.retucio
|
||||
archives_base_name=sputnik
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
Whitespace-only changes.
@@ -7,6 +7,8 @@ import me.retucio.sputnik.command.CommandManager;
|
||||
import me.retucio.sputnik.command.commands.BindCommand;
|
||||
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.config.ProfileManager;
|
||||
import me.retucio.sputnik.macro.MacroManager;
|
||||
|
||||
import me.retucio.sputnik.event.ShutdownEvent;
|
||||
import me.retucio.sputnik.event.interact.OpenScreenEvent;
|
||||
@@ -17,12 +19,14 @@ import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
|
||||
import me.retucio.sputnik.ui.hud.HudEditor;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.ui.screen.ClickGui;
|
||||
import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||
import me.retucio.sputnik.ui.screen.UpdateScreen;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.FileButton;
|
||||
import me.retucio.sputnik.ui.widgets.buttons.settings.TextButton;
|
||||
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
|
||||
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
|
||||
@@ -99,12 +103,17 @@ public class Sputnik implements ClientModInitializer {
|
||||
EVENT_BUS.subscribe(MiscUtil.class);
|
||||
EVENT_BUS.subscribe(NetworkUtil.class);
|
||||
EVENT_BUS.subscribe(RenderUtil.class);
|
||||
EVENT_BUS.subscribe(RotationUtil.class);
|
||||
|
||||
EVENT_BUS.subscribe(BlockIterator.class);
|
||||
|
||||
Lists.init();
|
||||
|
||||
HudRenderer.INSTANCE = new HudRenderer();
|
||||
HudEditor.INSTANCE = new HudEditor();
|
||||
|
||||
MacroManager.INSTANCE = new MacroManager();
|
||||
ProfileManager.INSTANCE = new ProfileManager();
|
||||
|
||||
CapeManager.INSTANCE = new CapeManager();
|
||||
EVENT_BUS.post(new LoadCapeManagerEvent());
|
||||
@@ -151,11 +160,12 @@ public class Sputnik implements ClientModInitializer {
|
||||
// prevenir interrumpir combos de F3
|
||||
if (key == GLFW.GLFW_KEY_F3) return;
|
||||
|
||||
boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.getSearchBar().isFocused();
|
||||
boolean anyFocused = isAnySettingButtonFocused() || ClickGui.INSTANCE.isCapturingInput();
|
||||
ClickGui.INSTANCE.setAnyFocused(anyFocused);
|
||||
|
||||
if (action != GLFW.GLFW_RELEASE) {
|
||||
if (BindCommand.onKeyPress(key)) return;
|
||||
if (action == GLFW.GLFW_PRESS && MacroManager.INSTANCE.onKeyPress(key)) return;
|
||||
if (action == GLFW.GLFW_PRESS) {
|
||||
handleModuleToggle(key, anyFocused);
|
||||
handleClickGuiKey(key, anyFocused);
|
||||
@@ -172,10 +182,15 @@ public class Sputnik implements ClientModInitializer {
|
||||
|
||||
// verifica si algún botón de ajustes está escuchando
|
||||
private boolean isAnySettingButtonFocused() {
|
||||
if (ClickGui.INSTANCE == null) return false;
|
||||
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
|
||||
for (Button sb : sf.getButtons())
|
||||
if ((sb instanceof BindButton b && b.isFocused()) || (sb instanceof TextButton t && t.isFocused()))
|
||||
if ((sb instanceof BindButton b && b.isFocused())
|
||||
|| (sb instanceof TextButton t && t.isFocused())
|
||||
|| (sb instanceof FileButton f && f.isFocused())
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -199,6 +214,7 @@ public class Sputnik implements ClientModInitializer {
|
||||
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
|
||||
for (SettingButton<?> sb : sf.getButtons()) {
|
||||
if (sb instanceof BindButton bb) bb.onKey(key, action);
|
||||
if (sb instanceof FileButton fb) fb.onKey(key, action);
|
||||
if (sb instanceof TextButton tb) tb.onKey(key, action);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.commands.CommandBuildContext;
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.data.registries.VanillaRegistries;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -20,12 +21,14 @@ public abstract class Command {
|
||||
|
||||
protected static final Minecraft mc = Minecraft.getInstance();
|
||||
|
||||
private final String name, description;
|
||||
private final String name, descriptionKey;
|
||||
private final List<String> aliases;
|
||||
|
||||
public Command(String name, String description, String... aliases) {
|
||||
// la descripción se guarda como clave de traducción, no como texto ya resuelto: los comandos
|
||||
// se construyen antes de que se cargue el idioma, así que hay que traducirla al mostrarla
|
||||
public Command(String name, String descriptionKey, String... aliases) {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.descriptionKey = descriptionKey;
|
||||
this.aliases = List.of(aliases);
|
||||
}
|
||||
|
||||
@@ -56,8 +59,12 @@ public abstract class Command {
|
||||
return name;
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
return description;
|
||||
public String getDescriptionKey() {
|
||||
return descriptionKey;
|
||||
}
|
||||
|
||||
public Component getDescription() {
|
||||
return Component.translatable(descriptionKey);
|
||||
}
|
||||
|
||||
public List<String> getAliases() {
|
||||
|
||||
@@ -38,10 +38,13 @@ public class CommandManager {
|
||||
addCommand(new EnderChestCommand());
|
||||
addCommand(new FriendCommand());
|
||||
addCommand(new GarbageCleanerCommand());
|
||||
addCommand(new HelpCommand());
|
||||
addCommand(new MacroCommand());
|
||||
addCommand(new PanoramaCommand());
|
||||
addCommand(new PeekCommand());
|
||||
addCommand(new PluginsCommand());
|
||||
addCommand(new PrefixCommand());
|
||||
addCommand(new ProfileCommand());
|
||||
addCommand(new PurgeCommand());
|
||||
addCommand(new RepeatCommand());
|
||||
addCommand(new RepeatWaitCommand());
|
||||
|
||||
@@ -24,7 +24,7 @@ public class BindCommand extends Command {
|
||||
private static Module listeningModule = null;
|
||||
|
||||
public BindCommand() {
|
||||
super("bind", Component.translatable("sputnik.commands.bind.desc").getString(), "keybind", "kb", "tecla");
|
||||
super("bind", "sputnik.commands.bind.desc", "keybind", "kb", "tecla");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,14 +7,13 @@ import me.retucio.sputnik.command.args.EnumArgumentType;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.gui.screens.inventory.ContainerScreen;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.inventory.ContainerInput;
|
||||
|
||||
// https://cdn.discordapp.com/attachments/1456079799045980400/1457154232737206375/dupersunited-public-addon-1.21.11-3.1.3.jar?ex=69735be1&is=69720a61&hm=77fb6faee49762e0a812661f0d98931e89cb725db711c45722249d0efe3b91e4&
|
||||
public class ClickSlotCommand extends Command {
|
||||
|
||||
public ClickSlotCommand() {
|
||||
super("clickslot", Component.translatable("sputnik.commands.clickslot.desc").getString(), "cs");
|
||||
super("clickslot", "sputnik.commands.clickslot.desc", "cs");
|
||||
}
|
||||
|
||||
public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
|
||||
|
||||
@@ -9,12 +9,11 @@ import me.retucio.sputnik.ui.screen.ClickGui;
|
||||
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
public class ConfigCommand extends Command {
|
||||
|
||||
public ConfigCommand() {
|
||||
super("config", Component.translatable("sputnik.commands.config.desc").getString(), "ajustes", "settings");
|
||||
super("config", "sputnik.commands.config.desc", "ajustes", "settings");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,13 +5,12 @@ import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.misc.ScreenshotPlus;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
// se usa principalmente para el módulo ScreenshotPlus, pero también se puede usar sin él supongo
|
||||
public class CopyScreenshotCommand extends Command {
|
||||
|
||||
public CopyScreenshotCommand() {
|
||||
super("copiarcaptura", Component.translatable("sputnik.commands.copyscreenshot.desc").getString(), "copyscreenshot");
|
||||
super("copiarcaptura", "sputnik.commands.copyscreenshot.desc", "copyscreenshot");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,7 +16,7 @@ public class EnderChestCommand extends Command {
|
||||
private boolean shouldOpenEchest = false;
|
||||
|
||||
public EnderChestCommand() {
|
||||
super("echest", Component.translatable("sputnik.commands.echest.desc").getString(), "ec", "enderchest");
|
||||
super("echest", "sputnik.commands.echest.desc", "ec", "enderchest");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,7 +15,7 @@ import net.minecraft.world.entity.player.Player;
|
||||
public class FriendCommand extends Command {
|
||||
|
||||
public FriendCommand() {
|
||||
super("friend", Component.translatable("sputnik.commands.friend.desc").getString(), "amigo", "f");
|
||||
super("friend", "sputnik.commands.friend.desc", "amigo", "f");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -9,12 +9,12 @@ import net.minecraft.network.chat.Component;
|
||||
public class GarbageCleanerCommand extends Command {
|
||||
|
||||
public GarbageCleanerCommand() {
|
||||
super("gc", Component.translatable("sputnik.commands.gc.desc").getString(), "garbagecollect");
|
||||
super("gc", "sputnik.commands.gc.desc", "garbagecollect");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
|
||||
builder.executes(context -> {
|
||||
builder.executes(ctx -> {
|
||||
System.gc();
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.gc.collected"));
|
||||
return SUCCESS;
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.command.CommandManager;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
public class HelpCommand extends Command {
|
||||
|
||||
public HelpCommand() {
|
||||
super("help", Component.translatable("sputnik.commands.help.desc").getString(), "?", "ayuda", "h");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
|
||||
builder.executes(ctx -> {
|
||||
for (Command command : CommandManager.commands) {
|
||||
ChatUtil.info(CommandManager.INSTANCE.getPrefix()
|
||||
+ ChatFormatting.BOLD + command.getName() + ": "
|
||||
+ ChatFormatting.RESET + ChatFormatting.GRAY + command.getDescription().getString());
|
||||
}
|
||||
return SUCCESS;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import com.mojang.brigadier.suggestion.SuggestionProvider;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.macro.Macro;
|
||||
import me.retucio.sputnik.macro.MacroManager;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class MacroCommand extends Command {
|
||||
|
||||
private static final SuggestionProvider<SharedSuggestionProvider> MACROS = (ctx, builder) ->
|
||||
SharedSuggestionProvider.suggest(
|
||||
MacroManager.INSTANCE.getMacros().stream().map(Macro::getName), builder);
|
||||
|
||||
public MacroCommand() {
|
||||
super("macro", "sputnik.commands.macro.desc", "macros");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
|
||||
builder
|
||||
.executes(ctx -> {
|
||||
list();
|
||||
return SUCCESS;
|
||||
})
|
||||
.then(literal("list").executes(ctx -> {
|
||||
list();
|
||||
return SUCCESS;
|
||||
}))
|
||||
.then(literal("add")
|
||||
.then(argument("nombre", StringArgumentType.word()).executes(ctx -> {
|
||||
String name = ctx.getArgument("nombre", String.class);
|
||||
|
||||
if (MacroManager.INSTANCE.add(new Macro(name)))
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.added",
|
||||
ChatFormatting.AQUA + name));
|
||||
else
|
||||
ChatUtil.error(Component.translatable("sputnik.commands.macro.exists", name));
|
||||
return SUCCESS;
|
||||
})))
|
||||
.then(literal("remove")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS).executes(ctx -> {
|
||||
Macro macro = get(ctx.getArgument("nombre", String.class));
|
||||
if (macro == null) return SUCCESS;
|
||||
|
||||
MacroManager.INSTANCE.remove(macro);
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.removed",
|
||||
ChatFormatting.AQUA + macro.getName()));
|
||||
return SUCCESS;
|
||||
})))
|
||||
.then(literal("line")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS)
|
||||
.then(argument("línea", StringArgumentType.greedyString()).executes(ctx -> {
|
||||
Macro macro = get(ctx.getArgument("nombre", String.class));
|
||||
if (macro == null) return SUCCESS;
|
||||
|
||||
String line = ctx.getArgument("línea", String.class);
|
||||
macro.getLines().add(line);
|
||||
MacroManager.INSTANCE.save();
|
||||
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.lineadded",
|
||||
ChatFormatting.AQUA + macro.getName()));
|
||||
return SUCCESS;
|
||||
}))))
|
||||
.then(literal("clear")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS).executes(ctx -> {
|
||||
Macro macro = get(ctx.getArgument("nombre", String.class));
|
||||
if (macro == null) return SUCCESS;
|
||||
|
||||
macro.getLines().clear();
|
||||
MacroManager.INSTANCE.save();
|
||||
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.cleared",
|
||||
ChatFormatting.AQUA + macro.getName()));
|
||||
return SUCCESS;
|
||||
})))
|
||||
.then(literal("run")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(MACROS).executes(ctx -> {
|
||||
Macro macro = get(ctx.getArgument("nombre", String.class));
|
||||
if (macro != null) macro.run();
|
||||
return SUCCESS;
|
||||
})));
|
||||
}
|
||||
|
||||
private static Macro get(String name) {
|
||||
Macro macro = MacroManager.INSTANCE.getByName(name);
|
||||
if (macro == null) ChatUtil.error(Component.translatable("sputnik.commands.macro.notfound", name));
|
||||
return macro;
|
||||
}
|
||||
|
||||
private static void list() {
|
||||
List<Macro> macros = MacroManager.INSTANCE.getMacros();
|
||||
|
||||
if (macros.isEmpty()) {
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.none"));
|
||||
return;
|
||||
}
|
||||
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.macro.list", macros.size()));
|
||||
for (Macro macro : macros)
|
||||
ChatUtil.addMessage(ChatFormatting.GRAY + " - " + macro.getName()
|
||||
+ ChatFormatting.DARK_GRAY + " [" + KeyUtil.getKeyName(macro.getKey()) + "] "
|
||||
+ macro.getLines().size());
|
||||
}
|
||||
}
|
||||
@@ -57,7 +57,7 @@ public class PanoramaCommand extends Command {
|
||||
@Nullable Path dir = null;
|
||||
|
||||
public PanoramaCommand() {
|
||||
super("panorama", Component.translatable("sputnik.commands.panorama.desc").getString());
|
||||
super("panorama", "sputnik.commands.panorama.desc");
|
||||
}
|
||||
|
||||
private void takeScreenshot() {
|
||||
|
||||
@@ -6,7 +6,6 @@ import me.retucio.sputnik.command.args.PlayerArgumentType;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
@@ -14,7 +13,7 @@ import java.awt.*;
|
||||
public class PeekCommand extends Command {
|
||||
|
||||
public PeekCommand() {
|
||||
super("inventario", Component.translatable("sputnik.commands.peek.desc").getString(), "invsee", "peek", "inv");
|
||||
super("inventario", "sputnik.commands.peek.desc", "invsee", "peek", "inv");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -24,7 +24,7 @@ public class PluginsCommand extends Command {
|
||||
private boolean scanning = false;
|
||||
|
||||
public PluginsCommand() {
|
||||
super("plugins", Component.translatable("sputnik.commands.plugins.desc").getString(), "pl", "serverplugins");
|
||||
super("plugins", "sputnik.commands.plugins.desc", "pl", "serverplugins");
|
||||
Sputnik.EVENT_BUS.subscribe(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.network.chat.Component;
|
||||
public class PrefixCommand extends Command {
|
||||
|
||||
public PrefixCommand() {
|
||||
super("prefijo", Component.translatable("sputnik.commands.prefix.desc").getString(), "prefix");
|
||||
super("prefijo", "sputnik.commands.prefix.desc", "prefix");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
package me.retucio.sputnik.command.commands;
|
||||
|
||||
import com.mojang.brigadier.arguments.StringArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import com.mojang.brigadier.suggestion.SuggestionProvider;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.config.ProfileManager;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class ProfileCommand extends Command {
|
||||
|
||||
private static final SuggestionProvider<SharedSuggestionProvider> PROFILES = (ctx, builder) ->
|
||||
SharedSuggestionProvider.suggest(ProfileManager.INSTANCE.getProfileNames(), builder);
|
||||
|
||||
public ProfileCommand() {
|
||||
super("perfil", "sputnik.commands.profile.desc", "profile", "perfiles", "profiles");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void build(LiteralArgumentBuilder<SharedSuggestionProvider> builder) {
|
||||
builder
|
||||
.executes(ctx -> {
|
||||
list();
|
||||
return SUCCESS;
|
||||
})
|
||||
.then(literal("list").executes(ctx -> {
|
||||
list();
|
||||
return SUCCESS;
|
||||
}))
|
||||
.then(literal("save")
|
||||
.then(argument("nombre", StringArgumentType.word()).executes(ctx -> {
|
||||
String name = ctx.getArgument("nombre", String.class);
|
||||
|
||||
if (!ProfileManager.isValidName(name)) {
|
||||
ChatUtil.error(Component.translatable("sputnik.commands.profile.invalidname", name));
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
if (ProfileManager.INSTANCE.save(name)) {
|
||||
ConfigManager.INSTANCE.save();
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.profile.saved",
|
||||
ChatFormatting.AQUA + name));
|
||||
} else {
|
||||
ChatUtil.error(Component.translatable("sputnik.commands.profile.savefailed", name));
|
||||
}
|
||||
return SUCCESS;
|
||||
})))
|
||||
.then(literal("load")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(PROFILES).executes(ctx -> {
|
||||
String name = ctx.getArgument("nombre", String.class);
|
||||
|
||||
if (ProfileManager.INSTANCE.load(name))
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.profile.loaded",
|
||||
ChatFormatting.AQUA + name));
|
||||
else
|
||||
ChatUtil.error(Component.translatable("sputnik.commands.profile.notfound", name));
|
||||
return SUCCESS;
|
||||
})))
|
||||
.then(literal("delete")
|
||||
.then(argument("nombre", StringArgumentType.word()).suggests(PROFILES).executes(ctx -> {
|
||||
String name = ctx.getArgument("nombre", String.class);
|
||||
|
||||
if (ProfileManager.INSTANCE.delete(name))
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.profile.deleted",
|
||||
ChatFormatting.AQUA + name));
|
||||
else
|
||||
ChatUtil.error(Component.translatable("sputnik.commands.profile.notfound", name));
|
||||
return SUCCESS;
|
||||
})));
|
||||
}
|
||||
|
||||
private static void list() {
|
||||
List<String> profiles = ProfileManager.INSTANCE.getProfileNames();
|
||||
|
||||
if (profiles.isEmpty()) {
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.profile.none"));
|
||||
return;
|
||||
}
|
||||
|
||||
String current = ProfileManager.INSTANCE.getCurrent();
|
||||
ChatUtil.info(Component.translatable("sputnik.commands.profile.list", profiles.size()));
|
||||
for (String profile : profiles)
|
||||
ChatUtil.addMessage((profile.equals(current) ? ChatFormatting.GREEN : ChatFormatting.GRAY) + " - " + profile);
|
||||
}
|
||||
}
|
||||
@@ -3,19 +3,17 @@ package me.retucio.sputnik.command.commands;
|
||||
import com.mojang.brigadier.arguments.IntegerArgumentType;
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.interfaces.IChatComponent;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatComponent;
|
||||
import net.minecraft.client.gui.components.ChatComponent;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.awt.*;
|
||||
import java.util.List;
|
||||
|
||||
public class PurgeCommand extends Command {
|
||||
|
||||
public PurgeCommand() {
|
||||
super("purgar", Component.translatable("sputnik.commands.purge.desc").getString(), "purge");
|
||||
super("purgar", "sputnik.commands.purge.desc", "purge");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,12 +6,11 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
public class RepeatCommand extends Command {
|
||||
|
||||
public RepeatCommand() {
|
||||
super("repetir", Component.translatable("sputnik.commands.repeat.desc").getString(), "repeat");
|
||||
super("repetir", "sputnik.commands.repeat.desc", "repeat");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,6 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
@@ -14,7 +13,7 @@ import java.util.concurrent.TimeUnit;
|
||||
public class RepeatWaitCommand extends Command {
|
||||
|
||||
public RepeatWaitCommand() {
|
||||
super("repesperar", Component.translatable("sputnik.commands.repeatwait.desc").getString(), "repeatwait");
|
||||
super("repesperar", "sputnik.commands.repeatwait.desc", "repeatwait");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.io.IOException;
|
||||
public class SaveScreenshotCommand extends Command {
|
||||
|
||||
public SaveScreenshotCommand() {
|
||||
super("guardarcaptura", Component.translatable("sputnik.commands.savescreenshot.desc").getString(), "savescreenshot");
|
||||
super("guardarcaptura", "sputnik.commands.savescreenshot.desc", "savescreenshot");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,6 @@ import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.mixin.accessors.ClientPacketListenerAccessor;
|
||||
import net.minecraft.client.multiplayer.ClientPacketListener;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.LastSeenMessagesTracker;
|
||||
import net.minecraft.network.chat.MessageSignature;
|
||||
import net.minecraft.network.chat.SignedMessageBody;
|
||||
@@ -19,7 +18,7 @@ import java.time.Instant;
|
||||
public class SendCommand extends Command {
|
||||
|
||||
public SendCommand() {
|
||||
super("enviar", Component.translatable("sputnik.commands.send.desc").getString(), "send");
|
||||
super("enviar", "sputnik.commands.send.desc", "send");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,7 +7,6 @@ import me.retucio.sputnik.command.args.EntityArgumentType;
|
||||
import me.retucio.sputnik.event.input.KeyEvent;
|
||||
import me.retucio.sputnik.util.EntityUtil;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
@@ -16,7 +15,7 @@ import java.awt.*;
|
||||
public class SpectateCommand extends Command {
|
||||
|
||||
public SpectateCommand() {
|
||||
super("espectar", Component.translatable("sputnik.commands.spectate.desc").getString(), "spectate", "spec");
|
||||
super("espectar", "sputnik.commands.spectate.desc", "spectate", "spec");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,6 @@ import me.retucio.sputnik.command.args.ModuleArgumentType;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
@@ -14,7 +13,7 @@ import java.awt.*;
|
||||
public class ToggleCommand extends Command {
|
||||
|
||||
public ToggleCommand() {
|
||||
super("alternar", Component.translatable("sputnik.commands.toggle.desc").getString(), "toggle");
|
||||
super("alternar", "sputnik.commands.toggle.desc", "toggle");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,6 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.retucio.sputnik.command.Command;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.commands.SharedSuggestionProvider;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||
@@ -17,7 +16,7 @@ public class WaitCommand extends Command {
|
||||
private static final ScheduledExecutorService DELAYED_EXECUTOR = new ScheduledThreadPoolExecutor(2);
|
||||
|
||||
public WaitCommand() {
|
||||
super("wait", Component.translatable("sputnik.commands.wait.desc").getString(), "esperar", "sleep", "delay");
|
||||
super("wait", "sputnik.commands.wait.desc", "esperar", "sleep", "delay");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,7 +14,8 @@ import java.util.Map;
|
||||
public class BinarySerializer {
|
||||
|
||||
private static final int MAGIC_NUMBER = 0x53505554; // "SPUT"
|
||||
private static final int VERSION = 2;
|
||||
private static final int VERSION = 3;
|
||||
private static final int MIN_VERSION = 2;
|
||||
|
||||
private static final byte TYPE_NULL = 0;
|
||||
private static final byte TYPE_BOOLEAN = 1;
|
||||
@@ -72,6 +73,8 @@ public class BinarySerializer {
|
||||
writeStringBooleanMap(out, config.hudVisibilities);
|
||||
writeStringStringMap(out, config.hudImagePaths);
|
||||
writeStringStringMap(out, config.friends);
|
||||
writeMacros(out, config.macros);
|
||||
writeString(out, config.currentProfile);
|
||||
|
||||
if (config.searchBarPosition != null) {
|
||||
out.writeBoolean(true);
|
||||
@@ -104,9 +107,8 @@ public class BinarySerializer {
|
||||
"formato de archivo inválido: %s", magic));
|
||||
}
|
||||
|
||||
// todo: sustituir por lógica de migración en vez de simplemente no aceptarlo
|
||||
int version = in.readInt();
|
||||
if (version != VERSION) {
|
||||
if (version < MIN_VERSION || version > VERSION) {
|
||||
throw new IOException(I18nUtil.fmt("sputnik.config.error.invalidversion",
|
||||
"versión inválida: %s", version));
|
||||
}
|
||||
@@ -123,6 +125,9 @@ public class BinarySerializer {
|
||||
Map<String, String> hudImagePaths = readStringStringMap(in);
|
||||
Map<String, String> friends = readStringStringMap(in);
|
||||
|
||||
List<ClientConfig.MacroData> macros = version >= 3 ? readMacros(in) : new ArrayList<>();
|
||||
String currentProfile = version >= 3 ? readString(in) : "";
|
||||
|
||||
// leer pos. de la barra de búsqueda
|
||||
int[] searchBarPosition = in.readBoolean()
|
||||
? new int[]{in.readInt(), in.readInt()}
|
||||
@@ -137,6 +142,8 @@ public class BinarySerializer {
|
||||
config.hudVisibilities = hudVisibilities;
|
||||
config.hudImagePaths = hudImagePaths;
|
||||
config.friends = friends;
|
||||
config.macros = macros;
|
||||
config.currentProfile = currentProfile == null ? "" : currentProfile;
|
||||
if (searchBarPosition != null) config.searchBarPosition = searchBarPosition;
|
||||
|
||||
return config;
|
||||
@@ -386,6 +393,35 @@ public class BinarySerializer {
|
||||
return map;
|
||||
}
|
||||
|
||||
private static void writeMacros(DataOutputStream out, List<ClientConfig.MacroData> macros)
|
||||
throws IOException {
|
||||
if (macros == null) {
|
||||
out.writeInt(0);
|
||||
return;
|
||||
}
|
||||
out.writeInt(macros.size());
|
||||
for (ClientConfig.MacroData macro : macros) {
|
||||
writeString(out, macro.name());
|
||||
out.writeInt(macro.key());
|
||||
out.writeInt(macro.lines().size());
|
||||
for (String line : macro.lines()) writeString(out, line);
|
||||
}
|
||||
}
|
||||
|
||||
private static List<ClientConfig.MacroData> readMacros(DataInputStream in) throws IOException {
|
||||
int size = in.readInt();
|
||||
List<ClientConfig.MacroData> macros = new ArrayList<>(size);
|
||||
for (int i = 0; i < size; i++) {
|
||||
String name = readString(in);
|
||||
int key = in.readInt();
|
||||
int lineCount = in.readInt();
|
||||
List<String> lines = new ArrayList<>(lineCount);
|
||||
for (int j = 0; j < lineCount; j++) lines.add(readString(in));
|
||||
macros.add(new ClientConfig.MacroData(name, key, lines));
|
||||
}
|
||||
return macros;
|
||||
}
|
||||
|
||||
private static void writeString(DataOutputStream out, String str) throws IOException {
|
||||
if (str == null) {
|
||||
out.writeInt(-1);
|
||||
|
||||
@@ -47,19 +47,31 @@ public class ClientConfig {
|
||||
// amigos: uuid -> nombre
|
||||
public Map<String, String> friends = new HashMap<>();
|
||||
|
||||
public List<MacroData> macros = new ArrayList<>();
|
||||
|
||||
// perfil cargado actualmente, vacío si es la config. suelta
|
||||
public String currentProfile = "";
|
||||
|
||||
public ClientConfig() {
|
||||
EVENT_BUS.subscribe(this);
|
||||
}
|
||||
|
||||
// mientras se aplica una config. los cambios vienen de ella, así que reescribirla es
|
||||
// como poco redundante, y al cambiar de perfil pisaba lo que aún no se había aplicado
|
||||
private static boolean isApplying() {
|
||||
return ConfigManager.INSTANCE != null && ConfigManager.INSTANCE.isApplying();
|
||||
}
|
||||
|
||||
@EventListener
|
||||
public void onToggleModule(ToggleModuleEvent event) {
|
||||
if (isApplying()) return;
|
||||
ConfigManager.INSTANCE.setModuleState(event.getModule());
|
||||
}
|
||||
|
||||
@SuppressWarnings("rawtypes")
|
||||
@EventListener
|
||||
public void onUpdateSetting(UpdateSettingEvent event) {
|
||||
if (mc == null || !event.shouldSave()) return;
|
||||
if (mc == null || !event.shouldSave() || isApplying()) return;
|
||||
|
||||
// guardar ajustes con su respectivo tipo de valor, en formato "nombreMódulo:nombreAjuste"
|
||||
Object value = null;
|
||||
@@ -72,6 +84,7 @@ public class ClientConfig {
|
||||
case ListSetting l: value = l.getConfigValues(); break;
|
||||
case ColorSetting c: value = c.getConfigValue(); break;
|
||||
case OptionSetting o: value = o.getConfigName(); break;
|
||||
case FileSetting f: value = f.getValue(); break;
|
||||
default: break;
|
||||
}
|
||||
|
||||
@@ -153,6 +166,7 @@ public class ClientConfig {
|
||||
|
||||
@EventListener
|
||||
public void onAddFriend(FriendEvent.Add event) {
|
||||
if (isApplying()) return;
|
||||
String uuid = event.getFriend().getUuid().toString();
|
||||
String name = event.getFriend().getName();
|
||||
if (!friends.containsKey(uuid)) {
|
||||
@@ -163,6 +177,7 @@ public class ClientConfig {
|
||||
|
||||
@EventListener
|
||||
public void onRemoveFriend(FriendEvent.Remove event) {
|
||||
if (isApplying()) return;
|
||||
friends.remove(event.getFriend().getUuid().toString());
|
||||
ConfigManager.INSTANCE.markDirty();
|
||||
}
|
||||
@@ -170,4 +185,8 @@ public class ClientConfig {
|
||||
public record PanelData(int x, int y, boolean extended) implements Serializable {
|
||||
@Serial private static final long serialVersionUID = 1L;
|
||||
}
|
||||
|
||||
public record MacroData(String name, int key, List<String> lines) implements Serializable {
|
||||
@Serial private static final long serialVersionUID = 1L;
|
||||
}
|
||||
}
|
||||
@@ -8,8 +8,11 @@ import me.retucio.sputnik.friend.FriendManager;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.ClientSettingsModule;
|
||||
import me.retucio.sputnik.macro.Macro;
|
||||
import me.retucio.sputnik.macro.MacroManager;
|
||||
import me.retucio.sputnik.module.setting.*;
|
||||
import me.retucio.sputnik.module.setting.settings.*;
|
||||
import me.retucio.sputnik.ui.hud.HudElement;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.ui.widgets.Panel;
|
||||
import me.retucio.sputnik.ui.widgets.panels.ExtendablePanel;
|
||||
@@ -25,7 +28,9 @@ import net.minecraft.network.chat.Component;
|
||||
import java.io.File;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
@@ -183,6 +188,8 @@ public class ConfigManager {
|
||||
applySearchBarPosition();
|
||||
applyExtendablePanels();
|
||||
applyFriends();
|
||||
applyMacros();
|
||||
applyHudElements();
|
||||
|
||||
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.applied", "ajustes aplicados"));
|
||||
} catch (Exception e) {
|
||||
@@ -199,11 +206,44 @@ public class ConfigManager {
|
||||
}
|
||||
|
||||
// true mientras se está cargando la config. sobre los ajustes. lo mira KeySetting para no
|
||||
// tratar las teclas guardadas como si el usuario las acabara de asignar
|
||||
// tratar las teclas guardadas como si el usuario las acabara de asignar, y ClientConfig
|
||||
// para no reescribir en la config. lo que se le está aplicando
|
||||
public boolean isApplying() {
|
||||
return applying;
|
||||
}
|
||||
|
||||
// sustituye la config. viva por otra y la vuelca sobre el estado actual del cliente
|
||||
public void replaceConfig(ClientConfig newConfig) {
|
||||
applying = true;
|
||||
try {
|
||||
resetLiveState();
|
||||
} finally {
|
||||
applying = false;
|
||||
}
|
||||
|
||||
setConfig(newConfig);
|
||||
loaded = false;
|
||||
applyConfig();
|
||||
save();
|
||||
}
|
||||
|
||||
// lo que no venga en la config. nueva tiene que quedarse en su valor por defecto, no en
|
||||
// el que tuviera el perfil anterior
|
||||
private void resetLiveState() {
|
||||
if (ClickGui.INSTANCE != null) ClickGui.INSTANCE.closeAllSettingsPanels();
|
||||
|
||||
for (Module module : ModuleManager.INSTANCE.getModules()) {
|
||||
module.setEnabled(false);
|
||||
module.getSettings().forEach(Setting::reset);
|
||||
}
|
||||
ClientSettingsPanel.clientSettings.getSettings().forEach(Setting::reset);
|
||||
|
||||
for (Friend friend : new ArrayList<>(FriendManager.INSTANCE.getFriends()))
|
||||
FriendManager.INSTANCE.remove(friend);
|
||||
|
||||
MacroManager.INSTANCE.setMacros(List.of());
|
||||
}
|
||||
|
||||
// obtener configuración actual
|
||||
public ClientConfig getConfig() {
|
||||
ensureConfig();
|
||||
@@ -258,6 +298,20 @@ public class ConfigManager {
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public void setMacros(List<Macro> macros) {
|
||||
ensureConfig();
|
||||
config.macros = macros.stream()
|
||||
.map(macro -> new ClientConfig.MacroData(macro.getName(), macro.getKey(), List.copyOf(macro.getLines())))
|
||||
.toList();
|
||||
markDirty();
|
||||
}
|
||||
|
||||
public void setCurrentProfile(String name) {
|
||||
ensureConfig();
|
||||
config.currentProfile = name;
|
||||
markDirty();
|
||||
}
|
||||
|
||||
|
||||
// ------------------ APLICAR AJUSTES ------------------
|
||||
|
||||
@@ -271,6 +325,26 @@ public class ConfigManager {
|
||||
"amigos aplicados"));
|
||||
}
|
||||
|
||||
public void applyMacros() {
|
||||
MacroManager.INSTANCE.setMacros(config.macros.stream()
|
||||
.map(data -> new Macro(data.name(), data.key(), data.lines()))
|
||||
.toList());
|
||||
}
|
||||
|
||||
// el HudRenderer coloca sus elementos al construirse, pero al cambiar de perfil ya existen
|
||||
public void applyHudElements() {
|
||||
if (HudRenderer.INSTANCE == null) return;
|
||||
|
||||
for (HudElement element : HudRenderer.INSTANCE.getElements()) {
|
||||
int[] position = config.hudPositions.get(element.getId());
|
||||
if (position != null && position.length == 2) element.setPosition(position[0], position[1]);
|
||||
else element.resetPosition();
|
||||
|
||||
Boolean visible = config.hudVisibilities.get(element.getId());
|
||||
element.setVisible(visible == null || visible);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
public void applySetting(Setting<?> setting) {
|
||||
String key = getSettingKey(setting);
|
||||
@@ -288,6 +362,7 @@ public class ConfigManager {
|
||||
case ListSetting listSetting -> applyListSetting(listSetting, value);
|
||||
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
|
||||
case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value);
|
||||
case FileSetting fileSetting -> applyFileSetting(fileSetting, value);
|
||||
default -> Sputnik.LOGGER.warn(I18nUtil.fmt("sputnik.config.warn.unknownsetting",
|
||||
"watafac queseso: %s", setting.getClass().getSimpleName()));
|
||||
}
|
||||
@@ -403,8 +478,8 @@ public class ConfigManager {
|
||||
}
|
||||
|
||||
private static void applyStringSetting(StringSetting setting, Object value) {
|
||||
if (value instanceof String) {
|
||||
setting.setValue((String) value);
|
||||
if (value instanceof String v) {
|
||||
setting.setValue(v);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -465,6 +540,12 @@ public class ConfigManager {
|
||||
}
|
||||
}
|
||||
|
||||
private static void applyFileSetting(FileSetting setting, Object value) {
|
||||
if (value instanceof String v) {
|
||||
setting.setValue(v);
|
||||
}
|
||||
}
|
||||
|
||||
private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, Consumer<T> setter) {
|
||||
Object value = map.get(key);
|
||||
if (type.isInstance(value)) {
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package me.retucio.sputnik.config;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class ProfileManager {
|
||||
|
||||
public static final int MAX_NAME_LENGTH = 32;
|
||||
|
||||
private static final File DIR = new File("sputnik/profiles");
|
||||
private static final String EXTENSION = ".dat";
|
||||
|
||||
public static ProfileManager INSTANCE;
|
||||
|
||||
public List<String> getProfileNames() {
|
||||
File[] files = DIR.listFiles((dir, name) -> name.endsWith(EXTENSION));
|
||||
if (files == null) return List.of();
|
||||
|
||||
List<String> names = new ArrayList<>();
|
||||
for (File file : files) {
|
||||
String name = file.getName();
|
||||
names.add(name.substring(0, name.length() - EXTENSION.length()));
|
||||
}
|
||||
names.sort(Comparator.naturalOrder());
|
||||
return names;
|
||||
}
|
||||
|
||||
public boolean exists(String name) {
|
||||
return fileOf(name).exists();
|
||||
}
|
||||
|
||||
public String getCurrent() {
|
||||
return ConfigManager.INSTANCE.getConfig().currentProfile;
|
||||
}
|
||||
|
||||
// vuelca la config. viva en el perfil y lo deja como actual
|
||||
public boolean save(String name) {
|
||||
if (!isValidName(name)) return false;
|
||||
|
||||
if (!DIR.exists() && !DIR.mkdirs()) {
|
||||
Sputnik.LOGGER.error(I18nUtil.fmt("sputnik.profile.error.dir",
|
||||
"no se pudo crear el directorio de perfiles"));
|
||||
return false;
|
||||
}
|
||||
|
||||
ConfigManager.INSTANCE.setCurrentProfile(name);
|
||||
try {
|
||||
BinarySerializer.writeConfig(ConfigManager.INSTANCE.getConfig(), fileOf(name));
|
||||
return true;
|
||||
} catch (IOException e) {
|
||||
Sputnik.LOGGER.error(I18nUtil.fmt("sputnik.profile.error.saving",
|
||||
"error al guardar el perfil \"%s\"", name), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean load(String name) {
|
||||
if (!exists(name)) return false;
|
||||
|
||||
ClientConfig profile;
|
||||
try {
|
||||
profile = BinarySerializer.readConfig(fileOf(name));
|
||||
} catch (IOException e) {
|
||||
Sputnik.LOGGER.error(I18nUtil.fmt("sputnik.profile.error.loading",
|
||||
"error al cargar el perfil \"%s\"", name), e);
|
||||
return false;
|
||||
}
|
||||
|
||||
profile.currentProfile = name;
|
||||
ConfigManager.INSTANCE.replaceConfig(profile);
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean delete(String name) {
|
||||
if (!exists(name)) return false;
|
||||
if (!fileOf(name).delete()) return false;
|
||||
|
||||
if (name.equals(getCurrent())) ConfigManager.INSTANCE.setCurrentProfile("");
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean isValidName(String name) {
|
||||
return name != null
|
||||
&& !name.isBlank()
|
||||
&& name.length() <= MAX_NAME_LENGTH
|
||||
&& name.matches("[a-zA-Z0-9 _-]+");
|
||||
}
|
||||
|
||||
private static File fileOf(String name) {
|
||||
return new File(DIR, name + EXTENSION);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package me.retucio.sputnik.event.interact;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class UpdateInventoryEvent extends Event {
|
||||
|
||||
private final List<ItemStack> prev;
|
||||
|
||||
public UpdateInventoryEvent(List<ItemStack> prev) {
|
||||
this.prev = prev;
|
||||
}
|
||||
|
||||
public List<ItemStack> getPrev() {
|
||||
return prev;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package me.retucio.sputnik.event.render;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
|
||||
|
||||
public class ApplyTransformationEvent extends Event {
|
||||
|
||||
private final ItemTransform transformation;
|
||||
private final boolean leftHanded;
|
||||
|
||||
public ApplyTransformationEvent(ItemTransform transformation, boolean leftHanded) {
|
||||
this.transformation = transformation;
|
||||
this.leftHanded = leftHanded;
|
||||
}
|
||||
|
||||
public ItemTransform getTransformation() {
|
||||
return transformation;
|
||||
}
|
||||
|
||||
public boolean isLeftHanded() {
|
||||
return leftHanded;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package me.retucio.sputnik.event.render;
|
||||
|
||||
import com.github.retucio.neutrino.Event;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||
import net.minecraft.client.renderer.entity.state.ItemEntityRenderState;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
|
||||
public class RenderItemEntityEvent extends Event {
|
||||
|
||||
public final ItemEntity itemEntity;
|
||||
public final ItemEntityRenderState renderState;
|
||||
public final PoseStack matrixStack;
|
||||
public final SubmitNodeCollector renderCommandQueue;
|
||||
public final int light;
|
||||
|
||||
public RenderItemEntityEvent(ItemEntityRenderState renderState, PoseStack matrixStack, SubmitNodeCollector renderCommandQueue, int light) {
|
||||
this.itemEntity = (ItemEntity) ((IEntityRenderState) renderState).sputnik$getEntity();
|
||||
this.renderState = renderState;
|
||||
this.matrixStack = matrixStack;
|
||||
this.renderCommandQueue = renderCommandQueue;
|
||||
this.light = light;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package me.retucio.sputnik.macro;
|
||||
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class Macro {
|
||||
|
||||
private String name;
|
||||
private int key;
|
||||
private final List<String> lines = new ArrayList<>();
|
||||
|
||||
private boolean searchMatch = true;
|
||||
|
||||
public Macro(String name) {
|
||||
this(name, GLFW.GLFW_KEY_UNKNOWN, List.of());
|
||||
}
|
||||
|
||||
public Macro(String name, int key, List<String> lines) {
|
||||
this.name = name;
|
||||
this.key = key;
|
||||
this.lines.addAll(lines);
|
||||
}
|
||||
|
||||
// cada línea se manda como si el usuario la hubiera escrito en el chat, así que valen
|
||||
// comandos del mod, comandos del servidor y mensajes normales
|
||||
public void run() {
|
||||
if (Minecraft.getInstance().player == null) return;
|
||||
for (String line : lines) {
|
||||
if (!line.isBlank()) ChatUtil.simulateChatMessage(line);
|
||||
}
|
||||
}
|
||||
|
||||
public String getName() { return name; }
|
||||
public void setName(String name) { this.name = name; }
|
||||
|
||||
public int getKey() { return key; }
|
||||
public void setKey(int key) { this.key = key; }
|
||||
|
||||
public List<String> getLines() { return lines; }
|
||||
|
||||
public void setLines(List<String> lines) {
|
||||
this.lines.clear();
|
||||
this.lines.addAll(lines);
|
||||
}
|
||||
|
||||
public boolean isSearchMatch() { return searchMatch; }
|
||||
public void setSearchMatch(boolean searchMatch) { this.searchMatch = searchMatch; }
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package me.retucio.sputnik.macro;
|
||||
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class MacroManager {
|
||||
|
||||
public static MacroManager INSTANCE;
|
||||
|
||||
private final List<Macro> macros = new ArrayList<>();
|
||||
|
||||
public boolean add(Macro macro) {
|
||||
if (getByName(macro.getName()) != null) return false;
|
||||
macros.add(macro);
|
||||
save();
|
||||
return true;
|
||||
}
|
||||
|
||||
public void remove(Macro macro) {
|
||||
macros.remove(macro);
|
||||
save();
|
||||
}
|
||||
|
||||
public Macro getByName(String name) {
|
||||
for (Macro macro : macros) {
|
||||
if (macro.getName().equalsIgnoreCase(name)) return macro;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean onKeyPress(int key) {
|
||||
if (key == GLFW.GLFW_KEY_UNKNOWN || Minecraft.getInstance().gui.screen() != null) return false;
|
||||
|
||||
boolean ran = false;
|
||||
for (Macro macro : new ArrayList<>(macros)) {
|
||||
if (macro.getKey() != key) continue;
|
||||
macro.run();
|
||||
ran = true;
|
||||
}
|
||||
return ran;
|
||||
}
|
||||
|
||||
public void setMacros(List<Macro> macros) {
|
||||
this.macros.clear();
|
||||
this.macros.addAll(macros);
|
||||
}
|
||||
|
||||
public void save() {
|
||||
if (ConfigManager.INSTANCE != null) ConfigManager.INSTANCE.setMacros(macros);
|
||||
}
|
||||
|
||||
public List<Macro> getMacros() {
|
||||
return macros;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package me.retucio.sputnik.mixin.accessors;
|
||||
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
|
||||
@Mixin(ItemStackRenderState.class)
|
||||
public interface ItemStackRenderStateAccessor {
|
||||
|
||||
@Accessor("activeLayerCount")
|
||||
int getActiveLayerCount();
|
||||
|
||||
@Accessor("layers")
|
||||
ItemStackRenderState.LayerRenderState[] getLayers();
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package me.retucio.sputnik.mixin.accessors;
|
||||
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
|
||||
@Mixin(ItemStackRenderState.LayerRenderState.class)
|
||||
public interface LayerRenderStateAccessor {
|
||||
|
||||
@Accessor("itemTransform")
|
||||
ItemTransform sputnik$getTransform();
|
||||
}
|
||||
@@ -11,9 +11,7 @@ import me.retucio.sputnik.module.modules.misc.AntiInvis;
|
||||
import me.retucio.sputnik.module.modules.movement.BoatFly;
|
||||
import me.retucio.sputnik.module.modules.movement.Velocity;
|
||||
import me.retucio.sputnik.module.modules.render.Nametags;
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
@@ -25,8 +23,6 @@ import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.entity.projectile.arrow.AbstractArrow;
|
||||
import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.joml.Vector3d;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
@@ -31,7 +31,7 @@ public abstract class EntityRendererMixin {
|
||||
|
||||
@ModifyExpressionValue(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getTeamColor()I"))
|
||||
private int setGlowESPColor(int original, @Local(argsOnly = true) Entity entity) {
|
||||
if (esp.isEnabled() && esp.mode.is(EntityEsp.ESPMode.GLOW) && esp.entities.isEnabled(entity.getType())) return esp.glowColor.getRGB();
|
||||
if (esp.isEnabled() && esp.mode.is(EntityEsp.ESPMode.GLOW) && esp.entities.isEnabled(entity.getType())) return esp.glowColor.getRgb();
|
||||
return original;
|
||||
}
|
||||
}
|
||||
@@ -5,10 +5,10 @@ import me.retucio.sputnik.event.network.ReceiveMessageEvent;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.misc.ChatPlus;
|
||||
|
||||
import me.retucio.sputnik.util.interfaces.IChatComponent;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.util.interfaces.IChatListener;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatComponent;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatListener;
|
||||
|
||||
import net.minecraft.client.gui.components.ChatComponent;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.hud;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.util.FormattedCharSequence;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.hud;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
|
||||
@@ -84,7 +84,7 @@ public abstract class HudMixin {
|
||||
// dangerous abbreviation
|
||||
CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class);
|
||||
|
||||
int color = cp.isEnabled() ? cp.color.getRGB() : -1;
|
||||
int color = cp.isEnabled() ? cp.color.getRgb() : -1;
|
||||
int w = cp.isEnabled() ? cp.width.getIntValue() : width;
|
||||
int h = cp.isEnabled() ? cp.height.getIntValue() : height;
|
||||
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package me.retucio.sputnik.mixin.mixins.item;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.render.RenderItemEntityEvent;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.renderer.SubmitNodeCollector;
|
||||
import net.minecraft.client.renderer.entity.ItemEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.state.ItemEntityRenderState;
|
||||
import net.minecraft.client.renderer.state.level.CameraRenderState;
|
||||
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
@Mixin(ItemEntityRenderer.class)
|
||||
public class ItemEntityRendererMixin {
|
||||
|
||||
@Inject(method = "submit(Lnet/minecraft/client/renderer/entity/state/ItemEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V", at = @At("HEAD"), cancellable = true)
|
||||
private void onSubmit(ItemEntityRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera, CallbackInfo ci) {
|
||||
RenderItemEntityEvent event = Sputnik.EVENT_BUS.post(
|
||||
new RenderItemEntityEvent(
|
||||
state,
|
||||
poseStack,
|
||||
submitNodeCollector,
|
||||
state.lightCoords
|
||||
)
|
||||
);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package me.retucio.sputnik.mixin.mixins.item;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.render.ApplyTransformationEvent;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ItemTransform.class)
|
||||
public abstract class ItemTransformMixin {
|
||||
@Inject(method = "apply", at = @At("HEAD"), cancellable = true)
|
||||
private void onApply(boolean applyLeftHandFix, PoseStack.Pose pose, CallbackInfo ci) {
|
||||
ApplyTransformationEvent event = Sputnik.EVENT_BUS.post(new ApplyTransformationEvent((ItemTransform) (Object) this, applyLeftHandFix));
|
||||
if (event.isCancelled()) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,16 +3,14 @@ package me.retucio.sputnik.mixin.mixins.misc;
|
||||
import com.llamalad7.mixinextras.sugar.Local;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.network.JoinWorldEvent;
|
||||
import me.retucio.sputnik.event.interact.OpenScreenEvent;
|
||||
import me.retucio.sputnik.event.ShutdownEvent;
|
||||
import me.retucio.sputnik.event.TickEvent;
|
||||
import me.retucio.sputnik.event.interact.UseItemEvent;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.camera.Freecam;
|
||||
import me.retucio.sputnik.module.modules.player.FastUse;
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import me.retucio.sputnik.mixinterfaces.IVec3;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.retucio.sputnik.mixin.mixins.misc;
|
||||
|
||||
import me.retucio.sputnik.util.interfaces.IVec3;
|
||||
import me.retucio.sputnik.mixinterfaces.IVec3;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.retucio.sputnik.mixin.mixins.network;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import me.retucio.sputnik.util.interfaces.IChatListener;
|
||||
import me.retucio.sputnik.mixinterfaces.IChatListener;
|
||||
import net.minecraft.client.multiplayer.chat.ChatListener;
|
||||
import net.minecraft.network.chat.ChatType;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ import me.retucio.sputnik.mixin.accessors.PackConfirmScreenAccessor;
|
||||
import me.retucio.sputnik.mixin.accessors.PendingRequestAccessor;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.network.RPackBypass;
|
||||
import me.retucio.sputnik.util.interfaces.IConfirmScreen;
|
||||
import me.retucio.sputnik.mixinterfaces.IConfirmScreen;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package me.retucio.sputnik.mixin.mixins.player;
|
||||
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.event.interact.UpdateInventoryEvent;
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
|
||||
@Mixin(Inventory.class)
|
||||
public abstract class InventoryMixin {
|
||||
|
||||
@Shadow @Final
|
||||
private NonNullList<ItemStack> items;
|
||||
|
||||
@Inject(method = "setChanged", at = @At("HEAD"))
|
||||
private void onChange(CallbackInfo ci) {
|
||||
Sputnik.EVENT_BUS.post(new UpdateInventoryEvent(items));
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -15,7 +15,7 @@ public abstract class EntityHitboxDebugRendererMixin {
|
||||
@ModifyVariable(method = "showHitboxes", at = @At("STORE"), name = "mainColor")
|
||||
private int modifyHitboxColor(int original) {
|
||||
Hitboxes hitboxes = ModuleManager.INSTANCE.getModuleByClass(Hitboxes.class);
|
||||
if (hitboxes.isEnabled()) return hitboxes.color.getRGB();
|
||||
if (hitboxes.isEnabled()) return hitboxes.color.getRgb();
|
||||
return original;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package me.retucio.sputnik.mixin.mixins.render;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
|
||||
@Mixin(EntityRenderDispatcher.class)
|
||||
public abstract class EntityRenderDispatcherMixin {
|
||||
@ModifyExpressionValue(
|
||||
method = "extractEntity(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;createRenderState(Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState;")
|
||||
)
|
||||
private <E extends Entity> EntityRenderState getAndUpdateRenderState$setEntity(EntityRenderState state, E entity, float partialTicks) {
|
||||
((IEntityRenderState) state).sputnik$setEntity(entity);
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package me.retucio.sputnik.mixin.mixins.render;
|
||||
|
||||
import me.retucio.sputnik.mixinterfaces.IEntityRenderState;
|
||||
import net.minecraft.client.renderer.entity.state.EntityRenderState;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
|
||||
|
||||
@Mixin(EntityRenderState.class)
|
||||
public abstract class EntityRenderStateMixin implements IEntityRenderState {
|
||||
@Unique
|
||||
private Entity entity;
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public Entity sputnik$getEntity() {
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sputnik$setEntity(Entity entity) {
|
||||
this.entity = entity;
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package me.retucio.sputnik.mixin.mixins.screen;
|
||||
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.network.RPackBypass;
|
||||
import me.retucio.sputnik.util.interfaces.IConfirmScreen;
|
||||
import me.retucio.sputnik.mixinterfaces.IConfirmScreen;
|
||||
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.layouts.LinearLayout;
|
||||
|
||||
@@ -33,7 +33,7 @@ public class ScreenMixin {
|
||||
if (watermark == null || watermark.isEmpty()) return;
|
||||
gui.text(mc.font, watermark,
|
||||
mc.getWindow().getGuiScaledWidth() - mc.font.width(watermark) - 2, 2,
|
||||
ClientSettingsPanel.clientSettings.color.getRGB(), false
|
||||
ClientSettingsPanel.clientSettings.color.getRgb(), false
|
||||
);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.client.multiplayer.chat.GuiMessage;
|
||||
import net.minecraft.network.chat.Component;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
public interface IConfirmScreen {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
|
||||
public interface IEntityRenderState {
|
||||
|
||||
@Nullable
|
||||
Entity sputnik$getEntity();
|
||||
|
||||
void sputnik$setEntity(Entity entity);
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
public interface IGuiMessageLine extends IGuiMessage {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.core.Vec3i;
|
||||
import org.joml.Vector3d;
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
/* code by meteorclient dev team */
|
||||
|
||||
package me.retucio.sputnik.util.interfaces;
|
||||
package me.retucio.sputnik.mixinterfaces;
|
||||
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.Style;
|
||||
@@ -6,16 +6,19 @@ import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.event.sputnik.ToggleModuleEvent;
|
||||
import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.ColorSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.KeySetting;
|
||||
import me.retucio.sputnik.module.setting.Setting;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.awt.*;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -35,8 +38,6 @@ public class Module {
|
||||
|
||||
// ajustes que están en todos los módulos
|
||||
|
||||
// estos cuatro están en los 93 módulos, así que comparten clave en vez de derivar una por módulo
|
||||
|
||||
protected KeySetting bind = new KeySetting(
|
||||
"tecla",
|
||||
"tecla asignada al módulo, ESC para desactivar",
|
||||
@@ -44,7 +45,7 @@ public class Module {
|
||||
).translationKey("sputnik.setting.common.bind");
|
||||
|
||||
// dejar al usuario elegir si el módulo debería apagarse tras soltar su tecla asignada, o si la tecla debería alternar su estado
|
||||
protected EnumSetting<KeyMode> keyMode = new EnumSetting<KeyMode>(
|
||||
protected EnumSetting<KeyMode> keyMode = new EnumSetting<>(
|
||||
"modo de tecla",
|
||||
"cómo interpretar la tecla configurada",
|
||||
KeyMode.class, KeyMode.TOGGLE
|
||||
@@ -56,12 +57,26 @@ public class Module {
|
||||
true
|
||||
).translationKey("sputnik.setting.common.notify");
|
||||
|
||||
protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<NotifyMode>(
|
||||
protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<>(
|
||||
"modo de notificación",
|
||||
"cómo notificar cuando se activa / desactiva",
|
||||
NotifyMode.class, NotifyMode.WIDGET
|
||||
).translationKey("sputnik.setting.common.notifymode");
|
||||
|
||||
protected BooleanSetting displayed = new BooleanSetting(
|
||||
"visible",
|
||||
"mostrar en el arraylist del HUD",
|
||||
true
|
||||
).translationKey("sputnik.setting.common.displayed");;
|
||||
|
||||
protected ColorSetting arraylistColor = new ColorSetting(
|
||||
"color del arraylist",
|
||||
"color a usar en el arraylist para el nombre del módulo",
|
||||
new Color(Colors.red, Colors.green, Colors.blue, Colors.alpha),
|
||||
true
|
||||
).translationKey("sputnik.setting.common.arraylistcolor")
|
||||
.visibility(displayed::getValue);
|
||||
|
||||
protected final List<SettingGroup> sgs = new ArrayList<>();
|
||||
protected final SettingGroup sgModule = addSg(new SettingGroup("módulo", false, "sputnik.group.common.module"));
|
||||
protected final SettingGroup sgGeneral = addSg(new SettingGroup("general", true, "sputnik.group.common.general"));
|
||||
@@ -72,14 +87,11 @@ public class Module {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.category = category;
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode);
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode, displayed, arraylistColor);
|
||||
}
|
||||
|
||||
public Module(String name, String description, Category category, int key) {
|
||||
this.name = name;
|
||||
this.description = description;
|
||||
this.category = category;
|
||||
sgModule.addAll(bind, keyMode, notify, notifyMode);
|
||||
this(name, description, category);
|
||||
this.bind.setDefaultValue(key);
|
||||
|
||||
// puto marcos
|
||||
@@ -155,9 +167,9 @@ public class Module {
|
||||
}
|
||||
}
|
||||
|
||||
// onDisable no miraba notify.getValue(), así que avisaba aunque estuviera desactivado
|
||||
private void notifyToggle(boolean on) {
|
||||
if (!notify.getValue()) return;
|
||||
if (ConfigManager.INSTANCE != null && ConfigManager.INSTANCE.isApplying()) return;
|
||||
|
||||
String key = on ? "sputnik.module.toggled.on" : "sputnik.module.toggled.off";
|
||||
Component message = Component.translatable(key, getDisplayName());
|
||||
@@ -249,6 +261,10 @@ public class Module {
|
||||
return bind;
|
||||
}
|
||||
|
||||
public boolean isVisible() { return displayed.getValue(); }
|
||||
|
||||
public Color getArraylistColor() { return arraylistColor.getValue(); }
|
||||
|
||||
public boolean isSearchMatch() {
|
||||
return searchMatch;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ import me.retucio.sputnik.module.modules.inventory.*;
|
||||
import me.retucio.sputnik.module.modules.misc.*;
|
||||
import me.retucio.sputnik.module.modules.movement.*;
|
||||
import me.retucio.sputnik.module.modules.network.*;
|
||||
import me.retucio.sputnik.module.modules.network.PacketLogger;
|
||||
import me.retucio.sputnik.module.modules.player.*;
|
||||
import me.retucio.sputnik.module.modules.render.*;
|
||||
import me.retucio.sputnik.module.modules.render.CritsPlus;
|
||||
@@ -90,6 +91,7 @@ public class ModuleManager {
|
||||
add(new ChestplateSwitch());
|
||||
add(new CrystalAura());
|
||||
add(new HoldAttack());
|
||||
add(new KillAura());
|
||||
add(new MaceKill());
|
||||
add(new ProjectileTrajectories());
|
||||
add(new SpearKill());
|
||||
@@ -128,6 +130,7 @@ public class ModuleManager {
|
||||
add(new Headhitters());
|
||||
add(new HitboxDesync());
|
||||
add(new InfiniteElytra());
|
||||
add(new ItemMagnet());
|
||||
add(new Jesus());
|
||||
add(new Parkour());
|
||||
add(new ReverseStep());
|
||||
@@ -142,7 +145,9 @@ public class ModuleManager {
|
||||
private void addNetwork() {
|
||||
add(new BungeecordSpoofer());
|
||||
add(new LogoutSpots());
|
||||
add(new PacketCanceller());
|
||||
add(new PacketDelay());
|
||||
add(new PacketLogger());
|
||||
add(new PacketMine());
|
||||
add(new Reconnect());
|
||||
add(new RPackBypass());
|
||||
@@ -151,6 +156,7 @@ public class ModuleManager {
|
||||
private void addPlayer() {
|
||||
add(new AirPlace());
|
||||
add(new AntiHunger());
|
||||
add(new AutoEat());
|
||||
add(new AutoFish());
|
||||
add(new Capes());
|
||||
add(new FastUse());
|
||||
@@ -171,6 +177,7 @@ public class ModuleManager {
|
||||
add(new Fonts());
|
||||
add(new GlintPlus());
|
||||
add(new Hitboxes());
|
||||
add(new ItemPhysics());
|
||||
add(new Lsd());
|
||||
add(new Nametags());
|
||||
add(new NoRender());
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
package me.retucio.sputnik.module.modules.camera;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.network.PacketEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
|
||||
|
||||
/**
|
||||
@@ -47,18 +45,7 @@ public class Autism extends Module {
|
||||
if (direction.is(RotationDirection.COUNTERCLOCKWISE))
|
||||
yaw -= interval.getFloatValue();
|
||||
|
||||
mc.getConnection().send(new ServerboundMovePlayerPacket.Rot(
|
||||
yaw,
|
||||
mc.player.getXRot(),
|
||||
mc.player.onGround(),
|
||||
mc.player.horizontalCollision
|
||||
));
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketSend(PacketEvent.Send event) {
|
||||
if (event.getPacket() instanceof ServerboundMovePlayerPacket.Rot packet
|
||||
&& packet.getYRot(yaw) != yaw) event.cancel();
|
||||
RotationUtil.requestYaw(RotationUtil.HIGHEST, yaw, RotationUtil.Mode.SILENT);
|
||||
}
|
||||
|
||||
private enum RotationDirection {
|
||||
|
||||
@@ -6,6 +6,7 @@ import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
|
||||
/**
|
||||
@@ -30,8 +31,7 @@ public class Rotations extends Module {
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
|
||||
mc.player.setYRot(yaw.getFloatValue());
|
||||
mc.player.setXRot(pitch.getFloatValue());
|
||||
RotationUtil.request(RotationUtil.HIGHEST, yaw.getFloatValue(), pitch.getFloatValue(), RotationUtil.Mode.CLIENT);
|
||||
|
||||
if (serverSide.getValue())
|
||||
mc.player.connection.send(
|
||||
|
||||
@@ -7,6 +7,7 @@ import me.retucio.sputnik.module.setting.settings.*;
|
||||
import me.retucio.sputnik.ui.hud.HudElement;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.ui.hud.HudEditorScreen;
|
||||
import me.retucio.sputnik.ui.hud.elements.CustomImageElement;
|
||||
import me.retucio.sputnik.ui.hud.elements.DynoElement;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
@@ -126,6 +127,19 @@ public class Hud extends Module {
|
||||
Dynosaurs.class, Dynosaurs.SPINOSAURUS
|
||||
));
|
||||
|
||||
public FileSetting customImagePath = sgElements.add(new FileSetting(
|
||||
"ruta de imagen",
|
||||
"ruta de la imagen a renderizar en el elemento de imagen custom",
|
||||
""
|
||||
));
|
||||
|
||||
public EnumSetting<SpeedUnits> speedUnit = sgElements.add(new EnumSetting<>(
|
||||
"velocidad",
|
||||
"unidad a usar para la velocidad",
|
||||
SpeedUnits.class,
|
||||
SpeedUnits.BPS
|
||||
));
|
||||
|
||||
public Hud() {
|
||||
super("HUD",
|
||||
"superposición de la pantalla con info. adicional",
|
||||
@@ -137,6 +151,11 @@ public class Hud extends Module {
|
||||
DynoElement element = (DynoElement) HudRenderer.INSTANCE.getElement(DynoElement.class);
|
||||
if (element != null) element.reloadTexture();
|
||||
});
|
||||
|
||||
customImagePath.onUpdate(v -> {
|
||||
CustomImageElement element = (CustomImageElement) HudRenderer.INSTANCE.getElement(CustomImageElement.class);
|
||||
if (element != null) element.reloadTexture();
|
||||
});
|
||||
}
|
||||
|
||||
public enum TimeFormat {
|
||||
@@ -171,4 +190,21 @@ public class Hud extends Module {
|
||||
@Override public String toString() { return name; }
|
||||
public String toRealString() { return super.toString(); }
|
||||
}
|
||||
|
||||
public enum SpeedUnits {
|
||||
BPT("bloques/tick", "b/t"),
|
||||
BPS("bloques/segundo", "b/s"),
|
||||
KBPH("kilobloques/hora", "kb/h");
|
||||
|
||||
private final String name;
|
||||
private final String symbol;
|
||||
|
||||
SpeedUnits(String name, String symbol) {
|
||||
this.name = name;
|
||||
this.symbol = symbol;
|
||||
}
|
||||
|
||||
@Override public String toString() { return name; }
|
||||
public String getSymbol() { return symbol; }
|
||||
}
|
||||
}
|
||||
@@ -234,11 +234,22 @@ public class CrystalAura extends Module {
|
||||
|
||||
private void doBreak() {
|
||||
if (breakTimer > 0) return;
|
||||
|
||||
List<Entity> crystals = new ArrayList<>();
|
||||
for (Entity entity : mc.level.getEntities().getAll()) {
|
||||
if (!(entity instanceof EndCrystal) || entity.distanceTo(mc.player) > mc.player.entityInteractionRange()) continue;
|
||||
if (rotateToBreak.getValue()) EntityUtil.lookAt(entity.getEyePosition());
|
||||
mc.gameMode.attack(mc.player, entity);
|
||||
crystals.add(entity);
|
||||
}
|
||||
|
||||
if (!crystals.isEmpty()) {
|
||||
Runnable attack = () -> crystals.forEach(crystal -> mc.gameMode.attack(mc.player, crystal));
|
||||
|
||||
// solo se puede apuntar a uno, así que se rompen todos rotando solo al primero
|
||||
if (rotateToBreak.getValue())
|
||||
RotationUtil.lookAt(RotationUtil.HIGH, crystals.getFirst().getEyePosition(), attack);
|
||||
else attack.run();
|
||||
}
|
||||
|
||||
breakTimer = breakDelay.getIntValue();
|
||||
}
|
||||
|
||||
@@ -254,8 +265,11 @@ public class CrystalAura extends Module {
|
||||
return;
|
||||
}
|
||||
|
||||
if (rotateToPlace.getValue()) EntityUtil.lookAt(Vec3.atCenterOf(result.getBlockPos()));
|
||||
mc.gameMode.startPrediction(mc.level, (sequence) -> new ServerboundUseItemOnPacket(hand, result, sequence));
|
||||
Runnable place = () -> mc.gameMode.startPrediction(mc.level, (sequence) -> new ServerboundUseItemOnPacket(hand, result, sequence));
|
||||
|
||||
if (rotateToPlace.getValue())
|
||||
RotationUtil.lookAt(RotationUtil.HIGH, Vec3.atCenterOf(result.getBlockPos()), place);
|
||||
else place.run();
|
||||
}
|
||||
|
||||
private void placeObby(BlockPos pos) {
|
||||
@@ -273,8 +287,11 @@ public class CrystalAura extends Module {
|
||||
BlockPos supportPos = pos.below();
|
||||
BlockHitResult result = new BlockHitResult(Vec3.atCenterOf(supportPos), Direction.UP, supportPos, false);
|
||||
|
||||
if (rotateToPlace.getValue()) EntityUtil.lookAt(Vec3.atCenterOf(pos));
|
||||
mc.gameMode.startPrediction(mc.level, (sequence) -> new ServerboundUseItemOnPacket(hand, result, sequence));
|
||||
Runnable place = () -> mc.gameMode.startPrediction(mc.level, (sequence) -> new ServerboundUseItemOnPacket(hand, result, sequence));
|
||||
|
||||
if (rotateToPlace.getValue())
|
||||
RotationUtil.lookAt(RotationUtil.HIGH, Vec3.atCenterOf(pos), place);
|
||||
else place.run();
|
||||
}
|
||||
|
||||
private void doAutoSelect(Item item) {
|
||||
|
||||
@@ -0,0 +1,133 @@
|
||||
package me.retucio.sputnik.module.modules.combat;
|
||||
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.ListSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
|
||||
|
||||
public class KillAura extends Module {
|
||||
|
||||
private final SettingGroup sgEntities = addSg(new SettingGroup("entidades", true));
|
||||
|
||||
private final NumberSetting reach = sgGeneral.add(new NumberSetting(
|
||||
"alcance", "qué tan lejos extender el brazo",
|
||||
3.0f, 0.1f, 64.0f, 0.1f
|
||||
));
|
||||
|
||||
private final EnumSetting<AttackMode> attackMode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo de ataque", "elige de qué manera atacar",
|
||||
AttackMode.class, AttackMode.TIMED
|
||||
));
|
||||
|
||||
private final NumberSetting cooldownPercentage = sgGeneral.add(new NumberSetting(
|
||||
"porcentaje de cooldown", "cuánto esperar a que se llene la barrita de ataque",
|
||||
100, 0, 100, 1
|
||||
));
|
||||
|
||||
private final BooleanSetting swingHand = sgGeneral.add(new BooleanSetting(
|
||||
"mover la mano", "mover la mano al atacar",
|
||||
true
|
||||
));
|
||||
|
||||
private final EnumSetting<ListMode> listMode = sgEntities.add(new EnumSetting<>(
|
||||
"modo de lista", "cómo interpretar la lista",
|
||||
ListMode.class, ListMode.WHITELIST
|
||||
));
|
||||
|
||||
private final ListSetting<EntityType<? extends Entity>> whitelist = sgEntities.add(new ListSetting<>(
|
||||
"entidades", "qué entidades atacar",
|
||||
Lists.entityList, Lists.allFalse(Lists.entityList), Lists.entityNames
|
||||
)).visibility(() -> listMode.is(ListMode.WHITELIST));
|
||||
|
||||
private final ListSetting<EntityType<? extends Entity>> blacklist = sgEntities.add(new ListSetting<>(
|
||||
"entidades ", "qué entidades NO atacar",
|
||||
Lists.entityList, Lists.allFalse(Lists.entityList), Lists.entityNames
|
||||
)).visibility(() -> listMode.is(ListMode.BLACKLIST));
|
||||
|
||||
public KillAura() {
|
||||
super("killaura", "si la violencia no funciona, es porque no has aplicado la suficiente", Category.COMBAT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null || mc.level == null) return;
|
||||
|
||||
Entity target = findClosestTarget();
|
||||
if (target != null) {
|
||||
attack(target);
|
||||
}
|
||||
}
|
||||
|
||||
private Entity findClosestTarget() {
|
||||
Entity closest = null;
|
||||
double closestDistSq = reach.getValue() * reach.getValue();
|
||||
|
||||
for (Entity entity : mc.level.getEntities().getAll()) {
|
||||
if (!shouldAttack(entity)) continue;
|
||||
|
||||
double distSq = entity.distanceToSqr(mc.player);
|
||||
if (distSq > closestDistSq) continue;
|
||||
|
||||
closest = entity;
|
||||
closestDistSq = distSq;
|
||||
}
|
||||
return closest;
|
||||
}
|
||||
|
||||
private void attack(Entity entity) {
|
||||
if (mc.player.getAttackStrengthScale(0) < cooldownPercentage.getNormalizedValue()
|
||||
&& attackMode.is(AttackMode.TIMED)
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!mc.level.isTickingEntity(entity)) return;
|
||||
|
||||
if (swingHand.getValue()) {
|
||||
mc.player.swing(InteractionHand.MAIN_HAND);
|
||||
}
|
||||
|
||||
mc.gameMode.attack(mc.player, entity);
|
||||
}
|
||||
|
||||
private boolean shouldAttack(Entity entity) {
|
||||
if (entity.is(mc.player)) return false;
|
||||
if (!entity.isAlive()) return false;
|
||||
if (entity.distanceToSqr(mc.player) > reach.getValue() * reach.getValue()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return switch (listMode.getValue()) {
|
||||
case WHITELIST -> whitelist.isEnabled(entity.getType());
|
||||
case BLACKLIST -> !blacklist.isEnabled(entity.getType());
|
||||
};
|
||||
}
|
||||
|
||||
private enum AttackMode {
|
||||
TIMED("timeado"),
|
||||
SPAM("spam");
|
||||
|
||||
private final String name;
|
||||
AttackMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
private enum ListMode {
|
||||
WHITELIST("lista blanca (incluir)"),
|
||||
BLACKLIST("lista negra (excluir)");
|
||||
|
||||
private final String name;
|
||||
ListMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
@@ -73,13 +74,11 @@ public class SpearKill extends Module {
|
||||
float yaw = (float) (Math.toDegrees(Math.atan2(toTarget.z, toTarget.x)) - 90.0);
|
||||
float pitch = (float) -Math.toDegrees(Math.asin(toTarget.y));
|
||||
|
||||
mc.player.setYRot(yaw);
|
||||
mc.player.setYHeadRot(yaw);
|
||||
mc.player.setXRot(pitch);
|
||||
RotationUtil.request(RotationUtil.HIGH, yaw, pitch, RotationUtil.Mode.CLIENT);
|
||||
|
||||
if (heldTicks >= 10) {
|
||||
double lungeSpeed = speed.getValue();
|
||||
Vec3 viewDir = Vec3.directionFromRotation(mc.player.getXRot(), mc.player.getYRot());
|
||||
Vec3 viewDir = Vec3.directionFromRotation(pitch, yaw);
|
||||
mc.player.setSprinting(true);
|
||||
mc.player.setDeltaMovement(viewDir.scale(lungeSpeed));
|
||||
}
|
||||
|
||||
@@ -15,9 +15,9 @@ import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.util.interfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.util.interfaces.TextVisitor;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessage;
|
||||
import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
|
||||
import me.retucio.sputnik.mixinterfaces.TextVisitor;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.components.PlayerFaceExtractor;
|
||||
|
||||
@@ -5,6 +5,7 @@ import me.retucio.sputnik.event.interact.UseItemEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
@@ -99,7 +100,7 @@ public class InfiniteElytra extends Module {
|
||||
}
|
||||
}
|
||||
|
||||
mc.player.setXRot(pitch);
|
||||
RotationUtil.requestPitch(RotationUtil.NORMAL, pitch, RotationUtil.Mode.CLIENT);
|
||||
}
|
||||
|
||||
@EventListener
|
||||
@@ -107,7 +108,7 @@ public class InfiniteElytra extends Module {
|
||||
if (mc.player == null) return;
|
||||
if (mc.player.getItemInHand(event.getHand()).getItem() == Items.FIREWORK_ROCKET && !mc.player.isSpectator() && mc.player.isFallFlying()) {
|
||||
pitch = pitchUp.getFloatValue();
|
||||
mc.player.setXRot(pitch);
|
||||
RotationUtil.requestPitch(RotationUtil.NORMAL, pitch, RotationUtil.Mode.CLIENT);
|
||||
state = FlyState.PITCHING_DOWN;
|
||||
lowestY = mc.player.getY();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
package me.retucio.sputnik.module.modules.movement;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.interact.UpdateInventoryEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class ItemMagnet extends Module {
|
||||
|
||||
private final NumberSetting range = sgGeneral.add(new NumberSetting(
|
||||
"rango", "rango de recogida de items",
|
||||
6, 1, 32, 0.5f
|
||||
));
|
||||
|
||||
@Nullable
|
||||
private ItemEntity current = null;
|
||||
|
||||
private AABB box = null;
|
||||
|
||||
private final List<ItemEntity> cannotPickUp = new ArrayList<>();
|
||||
|
||||
private int cooldown = 0;
|
||||
|
||||
public ItemMagnet() {
|
||||
super("imán de items", "recoge items distantes rápidamente mediante paquetes de movimiento", Category.MOVEMENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null || mc.level == null || mc.getConnection() == null) return;
|
||||
|
||||
if (current != null && !current.isAlive()) {
|
||||
current = null;
|
||||
cooldown = 0;
|
||||
}
|
||||
|
||||
if (current != null) {
|
||||
box = mc.player.getVehicle() == null
|
||||
? mc.player.getBoundingBox()
|
||||
: mc.player.getVehicle().getBoundingBox().minmax(mc.player.getBoundingBox()).inflate(1.0, 0, 1.0);
|
||||
|
||||
if (!box.intersects(current.getBoundingBox())) {
|
||||
if (cooldown > 0) {
|
||||
cooldown--;
|
||||
return;
|
||||
}
|
||||
|
||||
Vec3 realPos = mc.player.position();
|
||||
|
||||
// tparse al item
|
||||
mc.getConnection().send(new ServerboundMovePlayerPacket.Pos(
|
||||
current.getX(), current.getY(), current.getZ(),
|
||||
mc.player.onGround(),
|
||||
mc.player.horizontalCollision
|
||||
));
|
||||
|
||||
// para evitar desync
|
||||
mc.getConnection().send(new ServerboundMovePlayerPacket.Pos(
|
||||
realPos.x, realPos.y, realPos.z,
|
||||
mc.player.onGround(),
|
||||
mc.player.horizontalCollision
|
||||
));
|
||||
|
||||
// pequeño margen antes de reintentar con el mismo ítem
|
||||
cooldown = 2;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
for (Entity entity : mc.level.getEntities().getAll()) {
|
||||
if (entity.is(mc.player)) continue;
|
||||
if (entity.distanceToSqr(mc.player) > range.getFloatValue() * range.getFloatValue()) continue;
|
||||
|
||||
if (entity instanceof ItemEntity item) {
|
||||
if (cannotPickUp.contains(item)) continue;
|
||||
|
||||
if (InventoryUtil.findSlot(stack -> stack.is(item.getItem().getItem()) && stack.getCount() < stack.getMaxStackSize()) == -1
|
||||
&& mc.player.getInventory().getFreeSlot() == -1
|
||||
) {
|
||||
cannotPickUp.add(item);
|
||||
continue;
|
||||
}
|
||||
|
||||
current = item;
|
||||
cooldown = 0;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onInventoryChange(UpdateInventoryEvent event) {
|
||||
cannotPickUp.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -82,6 +82,15 @@ public class Scaffold extends Module {
|
||||
0.1
|
||||
)).visibility(extend::getValue);
|
||||
|
||||
private final NumberSetting bridgeWidth = sgBridge.add(new NumberSetting(
|
||||
"ancho del puente",
|
||||
"número de bloques de ancho del puente",
|
||||
1,
|
||||
1,
|
||||
5,
|
||||
1
|
||||
));
|
||||
|
||||
|
||||
/* torre */
|
||||
|
||||
@@ -160,7 +169,7 @@ public class Scaffold extends Module {
|
||||
|
||||
private final ColorSetting fillingColor = sgRender.add(new ColorSetting(
|
||||
"color del relleno",
|
||||
"color a uisar al renderizar el relleno",
|
||||
"color a usar al renderizar el relleno",
|
||||
Colors.withAlpha(Colors.mainColor, 60),
|
||||
false
|
||||
)).visibility(fillings::getValue);
|
||||
@@ -228,8 +237,12 @@ public class Scaffold extends Module {
|
||||
|
||||
// seleccionar nivel Y
|
||||
double y;
|
||||
if (mjBridge.getValue() && mjY != null && isMoving()) {
|
||||
y = mjY;
|
||||
if (mjBridge.getValue()) {
|
||||
if (mjY == null || !isMoving()) {
|
||||
// no moving (or not yet initialized): keep mjY synced to the real ground level
|
||||
mjY = (int) Math.floor(pos.y - 0.5);
|
||||
}
|
||||
y = isMoving() ? mjY : (pos.y - 0.5);
|
||||
} else {
|
||||
y = pos.y - 0.5;
|
||||
}
|
||||
@@ -243,7 +256,24 @@ public class Scaffold extends Module {
|
||||
|
||||
// colocar bloque
|
||||
bp.set(pos.x, y, pos.z);
|
||||
place(bp);
|
||||
BlockPos center = bp.immutable();
|
||||
|
||||
int width = bridgeWidth.getIntValue();
|
||||
if (width > 1) {
|
||||
Vec3 right = Vec3.directionFromRotation(0, mc.player.getYRot() + 90).normalize();
|
||||
int leftOff = (width - 1) / 2;
|
||||
int rightOff = width / 2;
|
||||
for (int i = -leftOff; i <= rightOff; i++) {
|
||||
BlockPos offsetPos = new BlockPos(
|
||||
(int) Math.round(center.getX() + right.x * i),
|
||||
center.getY(),
|
||||
(int) Math.round(center.getZ() + right.z * i)
|
||||
);
|
||||
place(offsetPos);
|
||||
}
|
||||
} else {
|
||||
place(center);
|
||||
}
|
||||
|
||||
// colocar bloque encima de la cabeza
|
||||
if (headhitter.getValue() && mc.options.keyJump.isDown() && !mc.options.keyShift.isDown()) {
|
||||
@@ -294,14 +324,6 @@ public class Scaffold extends Module {
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPlaceBlock(PlaceBlockEvent event) {
|
||||
// guardar último valor Y para el mj bridge
|
||||
if (mjBridge.getValue()) {
|
||||
mjY = event.getResult().getBlockPos().getY();
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onSneak(SneakEvent event) {
|
||||
// no agacharse
|
||||
@@ -334,8 +356,8 @@ public class Scaffold extends Module {
|
||||
if (NetworkUtil.placeBlock(
|
||||
pos, InteractionHand.MAIN_HAND,
|
||||
slot,
|
||||
rotate.getValue(),
|
||||
rotate.getValue(),
|
||||
rotate.getValue() ? RotationUtil.Mode.CLIENT : null,
|
||||
RotationUtil.NORMAL,
|
||||
swingHand.getValue(),
|
||||
true,
|
||||
true
|
||||
@@ -377,7 +399,7 @@ public class Scaffold extends Module {
|
||||
}
|
||||
|
||||
private boolean isMoving() {
|
||||
return mc.player.zza != 0
|
||||
return mc.player.zza != 0
|
||||
|| mc.player.xxa != 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package me.retucio.sputnik.module.modules.network;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.network.PacketEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.ListSetting;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.PacketType;
|
||||
import org.jspecify.annotations.NonNull;
|
||||
|
||||
|
||||
public class PacketCanceller extends Module {
|
||||
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting(
|
||||
"C2S", "paquetes a cancelar, dirección servidor",
|
||||
Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames
|
||||
));
|
||||
|
||||
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting(
|
||||
"S2C", "paquetes a cancelar, dirección cliente",
|
||||
Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames
|
||||
));
|
||||
|
||||
public PacketCanceller() {
|
||||
super("cancelador de paquetes", "cancela los paquetes seleccionados", Category.NETWORK);
|
||||
}
|
||||
|
||||
|
||||
@EventListener
|
||||
private void onPacketSend(PacketEvent.Send event) {
|
||||
if (c2s.isEnabled(event.getPacket().type())) {
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketReceive(PacketEvent.Receive event) {
|
||||
if (s2c.isEnabled(event.getPacket().type())) {
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -120,8 +120,6 @@ public class PacketDelay extends Module {
|
||||
|
||||
@EventListener
|
||||
private void onJoinWorld(JoinWorldEvent event) {
|
||||
// el aviso iba sin condición, así que el módulo se apagaba solo al entrar
|
||||
// a cualquier mundo, servidores incluidos
|
||||
if (!MiscUtil.isSingleplayer()) return;
|
||||
|
||||
ChatUtil.error(Component.translatable("sputnik.module.packetdelay.singleplayer"));
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
package me.retucio.sputnik.module.modules.network;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.event.network.PacketEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.FileSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.ListSetting;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.PacketType;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardOpenOption;
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneId;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
|
||||
public class PacketLogger extends Module {
|
||||
|
||||
private static final DateTimeFormatter TIME = DateTimeFormatter
|
||||
.ofPattern("HH:mm:ss.SSS")
|
||||
.withZone(ZoneId.systemDefault());
|
||||
|
||||
private static final int QUEUE_CAPACITY = 8192;
|
||||
private static final int BATCH_SIZE = 256;
|
||||
|
||||
private final ListSetting<PacketType<? extends Packet<?>>> packets = sgGeneral.add(new ListSetting<>(
|
||||
"paquetes", "paquetes a loguear",
|
||||
Lists.packetList, Lists.allFalse(Lists.packetList), Lists.packetNames
|
||||
));
|
||||
|
||||
private final EnumSetting<LogMode> mode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo de logueo", "de qué manera loguear los paquetes",
|
||||
LogMode.class, LogMode.FILE
|
||||
));
|
||||
|
||||
private final FileSetting file = sgGeneral.add(new FileSetting(
|
||||
"archivo", "archivo donde loguear los paquetes",
|
||||
"sputnik/packets.log"
|
||||
)).visibility(() -> mode.is(LogMode.FILE));
|
||||
|
||||
private final BlockingQueue<String> queue = new ArrayBlockingQueue<>(QUEUE_CAPACITY);
|
||||
private final AtomicInteger dropped = new AtomicInteger();
|
||||
|
||||
private volatile boolean running;
|
||||
private volatile Thread writer;
|
||||
|
||||
public PacketLogger() {
|
||||
super("logger de paquetes", "loguea paquetes", Category.NETWORK);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
startWriter();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
stopWriter();
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketSend(PacketEvent.Send event) {
|
||||
handle("OUT", event.getPacket());
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onPacketReceive(PacketEvent.Receive event) {
|
||||
handle("IN", event.getPacket());
|
||||
}
|
||||
|
||||
private void handle(String direction, Packet<?> packet) {
|
||||
if (packet == null || !packets.isEnabled(packet.type())) return;
|
||||
|
||||
String name = nameOf(packet);
|
||||
String body = describe(packet);
|
||||
|
||||
switch (mode.getValue()) {
|
||||
case CHAT -> onGameThread(() -> ChatUtil.info("[" + direction + "] " + body));
|
||||
case NOTIFICATION -> onGameThread(() -> HudRenderer.INSTANCE.pushNotification(name, body));
|
||||
case FILE -> enqueue("[" + TIME.format(Instant.now()) + "] [" + direction + "] " + name + " " + body);
|
||||
}
|
||||
}
|
||||
|
||||
private static void onGameThread(Runnable action) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (mc.isSameThread()) action.run();
|
||||
else mc.execute(action);
|
||||
}
|
||||
|
||||
private static String nameOf(Packet<?> packet) {
|
||||
PacketType<?> type = packet.type();
|
||||
return type.id().toString();
|
||||
}
|
||||
|
||||
private static String describe(Packet<?> packet) {
|
||||
try {
|
||||
return String.valueOf(packet);
|
||||
} catch (Throwable t) {
|
||||
return packet.getClass().getSimpleName() + " <toString failed: " + t + ">";
|
||||
}
|
||||
}
|
||||
|
||||
private void enqueue(String line) {
|
||||
if (!running) return;
|
||||
if (!queue.offer(line)) dropped.incrementAndGet();
|
||||
}
|
||||
|
||||
private void startWriter() {
|
||||
if (running) return;
|
||||
|
||||
Path path = file.getPath().toAbsolutePath();
|
||||
|
||||
queue.clear();
|
||||
dropped.set(0);
|
||||
running = true;
|
||||
|
||||
Thread thread = new Thread(() -> writerLoop(path), "sputnik-packet-logger");
|
||||
thread.setDaemon(true);
|
||||
thread.setPriority(Thread.MIN_PRIORITY);
|
||||
writer = thread;
|
||||
thread.start();
|
||||
}
|
||||
|
||||
private void stopWriter() {
|
||||
if (!running) return;
|
||||
running = false;
|
||||
|
||||
Thread thread = writer;
|
||||
writer = null;
|
||||
if (thread == null) return;
|
||||
|
||||
try {
|
||||
thread.join(2000);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
|
||||
int lost = dropped.getAndSet(0);
|
||||
if (lost > 0) {
|
||||
onGameThread(() -> ChatUtil.warn("se descartaron " + lost + " paquetes (cola llena)"));
|
||||
}
|
||||
}
|
||||
|
||||
private void writerLoop(Path path) {
|
||||
try {
|
||||
Path parent = path.getParent();
|
||||
if (parent != null) Files.createDirectories(parent);
|
||||
|
||||
try (BufferedWriter out = Files.newBufferedWriter(
|
||||
path, StandardCharsets.UTF_8,
|
||||
StandardOpenOption.CREATE, StandardOpenOption.APPEND)) {
|
||||
|
||||
out.write("--- sesión iniciada " + Instant.now() + " ---");
|
||||
out.newLine();
|
||||
out.flush();
|
||||
|
||||
List<String> batch = new ArrayList<>(BATCH_SIZE);
|
||||
|
||||
while (running || !queue.isEmpty()) {
|
||||
String first = queue.poll(250, TimeUnit.MILLISECONDS);
|
||||
if (first == null) continue;
|
||||
|
||||
batch.add(first);
|
||||
queue.drainTo(batch, BATCH_SIZE - 1);
|
||||
|
||||
for (String line : batch) {
|
||||
out.write(line);
|
||||
out.newLine();
|
||||
}
|
||||
batch.clear();
|
||||
out.flush();
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
} catch (IOException e) {
|
||||
running = false;
|
||||
queue.clear();
|
||||
onGameThread(() -> {
|
||||
ChatUtil.error("no se pudo escribir el log: " + e.getMessage());
|
||||
toggle();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private enum LogMode {
|
||||
CHAT("chat"),
|
||||
NOTIFICATION("notis"),
|
||||
FILE("archivo");
|
||||
|
||||
private final String name;
|
||||
LogMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import me.retucio.sputnik.module.setting.settings.ColorSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.EntityUtil;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import me.retucio.sputnik.util.render.RenderUtil;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -278,14 +278,18 @@ public class PacketMine extends Module {
|
||||
return false;
|
||||
}
|
||||
|
||||
rotate();
|
||||
Runnable mine = () -> {
|
||||
mc.gameMode.startPrediction(mc.level, sequence ->
|
||||
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, pos, dir, sequence));
|
||||
mc.gameMode.startPrediction(mc.level, sequence ->
|
||||
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, pos, dir, sequence));
|
||||
};
|
||||
|
||||
RotationUtil.Mode rotation = getRotationMode();
|
||||
if (rotation == null) mine.run();
|
||||
else RotationUtil.lookAt(RotationUtil.NORMAL, Vec3.atLowerCornerOf(pos), 0, rotation, mine);
|
||||
|
||||
mc.gameMode.startPrediction(mc.level, sequence ->
|
||||
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, pos, dir, sequence));
|
||||
mining = true;
|
||||
mc.gameMode.startPrediction(mc.level, sequence ->
|
||||
new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, pos, dir, sequence));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -303,13 +307,12 @@ public class PacketMine extends Module {
|
||||
);
|
||||
}
|
||||
|
||||
private void rotate() {
|
||||
Vec3 pos = Vec3.atLowerCornerOf(this.pos);
|
||||
switch (rotate.getValue()) {
|
||||
case CLIENT -> EntityUtil.lookAtClient(pos);
|
||||
case SERVER -> EntityUtil.lookAtServer(pos);
|
||||
case BOTH -> EntityUtil.lookAt(pos);
|
||||
}
|
||||
private RotationUtil.Mode getRotationMode() {
|
||||
return switch (rotate.getValue()) {
|
||||
case CLIENT, BOTH -> RotationUtil.Mode.CLIENT;
|
||||
case SERVER -> RotationUtil.Mode.SILENT;
|
||||
case NONE -> null;
|
||||
};
|
||||
}
|
||||
|
||||
public boolean shouldRetry() {
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
package me.retucio.sputnik.module.modules.player;
|
||||
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class AutoEat extends Module {
|
||||
|
||||
private final NumberSetting hunger = sgGeneral.add(new NumberSetting(
|
||||
"hambre", "cuánta hambre es necesaria para comer (puntos de comida)",
|
||||
6, 0, 19, 1
|
||||
));
|
||||
|
||||
private boolean eating;
|
||||
|
||||
public AutoEat() {
|
||||
super("puto gordo", "come automáticamente al tener hambre", Category.PLAYER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
|
||||
if (eating) {
|
||||
if (mc.player.getUseItemRemainingTicks() > 0) {
|
||||
return;
|
||||
} else {
|
||||
stopEating();
|
||||
}
|
||||
}
|
||||
|
||||
if (mc.player.getFoodData().getFoodLevel() <= hunger.getIntValue()) {
|
||||
List<ItemStack> sorted = InventoryUtil.findAllStacks(
|
||||
stack -> stack.getItem().components().get(DataComponents.FOOD) != null
|
||||
);
|
||||
sorted.sort(Comparator.comparingInt(stack -> stack.getItem().components().get(DataComponents.FOOD).nutrition()));
|
||||
if (sorted.isEmpty()) return;
|
||||
|
||||
boolean inHotbar = false;
|
||||
for (ItemStack stack : sorted) {
|
||||
int slot = InventoryUtil.findSlot(s -> stack == s);
|
||||
if (Inventory.isHotbarSlot(slot)) {
|
||||
mc.player.getInventory().setSelectedSlot(slot);
|
||||
inHotbar = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!inHotbar) {
|
||||
int free = mc.player.getInventory().getFreeSlot();
|
||||
|
||||
InventoryUtil.move(InventoryUtil.findSlot(stack -> stack == sorted.getFirst()), free != -1
|
||||
? free
|
||||
: mc.player.getInventory().getSelectedSlot());
|
||||
|
||||
if (free != -1) {
|
||||
mc.player.getInventory().setSelectedSlot(free);
|
||||
}
|
||||
}
|
||||
|
||||
startEating();
|
||||
}
|
||||
}
|
||||
|
||||
private void startEating() {
|
||||
eating = true;
|
||||
mc.options.keyUse.setDown(true);
|
||||
}
|
||||
|
||||
private void stopEating() {
|
||||
eating = false;
|
||||
mc.options.keyUse.setDown(false);
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
import me.retucio.sputnik.util.Lists;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
@@ -136,23 +137,23 @@ public class NoFall extends Module {
|
||||
return;
|
||||
}
|
||||
|
||||
// mirar abajo
|
||||
mc.player.setXRot(180);
|
||||
|
||||
int slot = mc.player.getInventory().findSlotMatchingItem(mlgItem);
|
||||
mc.player.getInventory().setSelectedSlot(slot);
|
||||
|
||||
// usar bloque
|
||||
if (mlgItem.getItem() instanceof BlockItem) {
|
||||
RotationUtil.requestPitch(RotationUtil.HIGH, 90, RotationUtil.Mode.CLIENT);
|
||||
shouldUse = true;
|
||||
placed = true;
|
||||
return;
|
||||
}
|
||||
|
||||
// usar ítem
|
||||
InteractionResult didPlace = mc.gameMode.useItem(mc.player, InteractionHand.MAIN_HAND);
|
||||
if (didPlace.consumesAction())
|
||||
placed = true;
|
||||
// mirar abajo y usar el ítem cuando el servidor lo vea
|
||||
RotationUtil.request(RotationUtil.HIGH, Float.NaN, 90, 0, RotationUtil.Mode.CLIENT, () -> {
|
||||
InteractionResult didPlace = mc.gameMode.useItem(mc.player, InteractionHand.MAIN_HAND);
|
||||
if (didPlace.consumesAction())
|
||||
placed = true;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class BlockOutline extends Module {
|
||||
|
||||
@EventListener
|
||||
private void onRenderBlockOutline(RenderBlockOutlineEvent event) {
|
||||
event.setColor(color.getRGB());
|
||||
event.setColor(color.getRgb());
|
||||
event.setLineWidth(lineWidth.getFloatValue());
|
||||
}
|
||||
}
|
||||
@@ -46,30 +46,30 @@ public class GlintPlus extends Module {
|
||||
}
|
||||
|
||||
public RenderType getGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.glint();
|
||||
return GlintRenderType.glintColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getGlintTranslucent() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent();
|
||||
return GlintRenderType.glintTranslucentColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getEntityGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !items.getValue()) return RenderTypes.entityGlint();
|
||||
return GlintRenderType.entityGlintColor.get(color);
|
||||
}
|
||||
|
||||
public RenderType getArmorEntityGlint() {
|
||||
int color = getColor();
|
||||
int color = getGlintColor();
|
||||
if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint();
|
||||
return GlintRenderType.armorEntityGlintColor.get(color);
|
||||
}
|
||||
|
||||
public int getColor() {
|
||||
public int getGlintColor() {
|
||||
String colorName = glintColor.getValue().getRealName().toLowerCase();
|
||||
|
||||
switch (colorName) {
|
||||
|
||||
@@ -0,0 +1,165 @@
|
||||
package me.retucio.sputnik.module.modules.render;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.math.Axis;
|
||||
import me.retucio.sputnik.event.render.ApplyTransformationEvent;
|
||||
import me.retucio.sputnik.event.render.RenderItemEntityEvent;
|
||||
import me.retucio.sputnik.mixin.accessors.ItemStackRenderStateAccessor;
|
||||
import me.retucio.sputnik.mixin.accessors.LayerRenderStateAccessor;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.SettingGroup;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import net.minecraft.client.renderer.item.ItemStackRenderState;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.resources.model.cuboid.ItemTransform;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import org.joml.Vector3f;
|
||||
import org.joml.Vector3fc;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemPhysics extends Module {
|
||||
|
||||
private static final float PIXEL_SIZE = 1f / 16f;
|
||||
|
||||
private final BooleanSetting randomRotation = sgGeneral.add(new BooleanSetting(
|
||||
"rotación aleatoria",
|
||||
"añade una rotación aleatoria a cada objeto",
|
||||
true
|
||||
));
|
||||
|
||||
private final RandomSource random = RandomSource.createThreadLocalInstance();
|
||||
private boolean skipTransformation;
|
||||
|
||||
public ItemPhysics() {
|
||||
super("física de objetos", "aplica física a los objetos en el suelo", Category.RENDER);
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onRenderItemEntity(RenderItemEntityEvent event) {
|
||||
event.cancel();
|
||||
|
||||
if (event.renderState.item.isEmpty() || event.itemEntity == null) return;
|
||||
|
||||
PoseStack matrices = event.matrixStack;
|
||||
random.setSeed(event.itemEntity.getId() * 0x53505554L);
|
||||
|
||||
var accessor = (ItemStackRenderStateAccessor) event.renderState.item;
|
||||
for (int i = 0; i < accessor.getActiveLayerCount(); i++) {
|
||||
ItemStackRenderState.LayerRenderState layer = accessor.getLayers()[i];
|
||||
ModelInfo info = getInfo(layer.prepareQuadList());
|
||||
|
||||
matrices.pushPose();
|
||||
applyTransformation(matrices, ((LayerRenderStateAccessor) layer).sputnik$getTransform());
|
||||
matrices.translate(0, info.offsetY, 0);
|
||||
offsetInWater(matrices, event.itemEntity);
|
||||
|
||||
if (info.flat) {
|
||||
matrices.mulPose(Axis.XP.rotationDegrees(90));
|
||||
matrices.translate(0, 0, info.offsetZ);
|
||||
}
|
||||
|
||||
if (randomRotation.getValue()) {
|
||||
var axis = Axis.YP;
|
||||
var x = 0.5f; var y = 0.0f; var z = 0.5f;
|
||||
|
||||
if (info.flat) {
|
||||
axis = Axis.ZP;
|
||||
y = 0.5f; z = 0.0f;
|
||||
}
|
||||
|
||||
float degrees = (random.nextFloat() * 2 - 1) * 90;
|
||||
matrices.translate(x, y, z);
|
||||
matrices.mulPose(axis.rotationDegrees(degrees));
|
||||
matrices.translate(-x, -y, -z);
|
||||
}
|
||||
|
||||
renderLayer(event, info);
|
||||
matrices.popPose();
|
||||
}
|
||||
}
|
||||
|
||||
@EventListener
|
||||
private void onApplyTransformation(ApplyTransformationEvent event) {
|
||||
if (skipTransformation) {
|
||||
event.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
private void renderLayer(RenderItemEntityEvent event, ModelInfo info) {
|
||||
PoseStack matrices = event.matrixStack;
|
||||
skipTransformation = true;
|
||||
|
||||
for (int j = 0; j < event.renderState.count; j++) {
|
||||
matrices.pushPose();
|
||||
|
||||
if (j > 0) {
|
||||
float x = (random.nextFloat() * 2 - 1) * 0.25f;
|
||||
float z = (random.nextFloat() * 2 - 1) * 0.25f;
|
||||
translate(matrices, info, x, 0, z);
|
||||
}
|
||||
|
||||
event.renderState.item.submit(matrices, event.renderCommandQueue, event.light, OverlayTexture.NO_OVERLAY, event.renderState.outlineColor);
|
||||
matrices.popPose();
|
||||
|
||||
float y = Math.max(random.nextFloat() * PIXEL_SIZE, PIXEL_SIZE / 2f);
|
||||
translate(matrices, info, 0, y, 0);
|
||||
}
|
||||
|
||||
skipTransformation = false;
|
||||
}
|
||||
|
||||
private void translate(PoseStack matrices, ModelInfo info, float x, float y, float z) {
|
||||
if (info.flat) {
|
||||
float temp = y; y = z; z = -temp;
|
||||
}
|
||||
matrices.translate(x, y, z);
|
||||
}
|
||||
|
||||
private void applyTransformation(PoseStack matrices, ItemTransform transform) {
|
||||
transform = new ItemTransform(
|
||||
transform.rotation(),
|
||||
new Vector3f(transform.translation().x(), 0, transform.translation().z()),
|
||||
transform.scale()
|
||||
);
|
||||
transform.apply(false, matrices.last());
|
||||
}
|
||||
|
||||
private void offsetInWater(PoseStack matrices, ItemEntity entity) {
|
||||
if (entity.isInWater()) {
|
||||
matrices.translate(0, 0.333f, 0);
|
||||
}
|
||||
}
|
||||
|
||||
private ModelInfo getInfo(List<net.minecraft.client.resources.model.geometry.BakedQuad> quads) {
|
||||
float minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
|
||||
float minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
|
||||
float minZ = Float.MAX_VALUE, maxZ = Float.MIN_VALUE;
|
||||
|
||||
for (var quad : quads) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
Vector3fc vec = quad.position(i);
|
||||
minY = Math.min(minY, vec.y()); maxY = Math.max(maxY, vec.y());
|
||||
minZ = Math.min(minZ, vec.z()); maxZ = Math.max(maxZ, vec.z());
|
||||
minX = Math.min(minX, vec.x()); maxX = Math.max(maxX, vec.x());
|
||||
}
|
||||
}
|
||||
|
||||
if (minX == Float.MAX_VALUE) minX = 0;
|
||||
if (minY == Float.MAX_VALUE) minY = 0;
|
||||
if (minZ == Float.MAX_VALUE) minZ = 0;
|
||||
if (maxX == Float.MIN_VALUE) maxX = 1;
|
||||
if (maxY == Float.MIN_VALUE) maxY = 1;
|
||||
if (maxZ == Float.MIN_VALUE) maxZ = 1;
|
||||
|
||||
float x = maxX - minX, y = maxY - minY, z = maxZ - minZ;
|
||||
boolean flat = (x > PIXEL_SIZE && y > PIXEL_SIZE && z <= PIXEL_SIZE);
|
||||
|
||||
return new ModelInfo(flat, 0.5f - minY, -maxZ);
|
||||
}
|
||||
|
||||
private record ModelInfo(boolean flat, float offsetY, float offsetZ) {}
|
||||
}
|
||||
@@ -6,12 +6,14 @@ import me.retucio.sputnik.event.input.MouseClickEvent;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.setting.settings.BooleanSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.EnumSetting;
|
||||
import me.retucio.sputnik.module.setting.settings.NumberSetting;
|
||||
import me.retucio.sputnik.util.InventoryUtil;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import me.retucio.sputnik.util.MiscUtil;
|
||||
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.component.Tool;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
@@ -26,6 +28,11 @@ import java.util.Map;
|
||||
|
||||
public class AutoTool extends Module {
|
||||
|
||||
private final EnumSetting<AutoToolMode> mode = sgGeneral.add(new EnumSetting<>(
|
||||
"modo", "de qué manera ejecutar el módulo",
|
||||
AutoToolMode.class, AutoToolMode.ON_CLICK
|
||||
));
|
||||
|
||||
private final NumberSetting delaySetting = sgGeneral.add(new NumberSetting(
|
||||
"delay",
|
||||
"delay al cambiar de herramienta",
|
||||
@@ -86,6 +93,11 @@ public class AutoTool extends Module {
|
||||
@Override
|
||||
public void onTick() {
|
||||
if (mc.player == null) return;
|
||||
if (mc.gui.screen() != null) return;
|
||||
|
||||
if (mode.is(AutoToolMode.ON_TICK) && mc.options.keyAttack.isDown()) {
|
||||
handle(KeyUtil.getKey(mc.options.keyAttack), GLFW.GLFW_PRESS);
|
||||
}
|
||||
|
||||
if (startedMining && delaySetting.getIntValue() > 0) {
|
||||
delay++;
|
||||
@@ -165,10 +177,12 @@ public class AutoTool extends Module {
|
||||
BlockState state = mc.level.getBlockState(bhr.getBlockPos());
|
||||
|
||||
List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL));
|
||||
if (tools.isEmpty()) return;
|
||||
|
||||
Map<Float, ItemStack> speeds = new HashMap<>();
|
||||
for (ItemStack tool : tools) {
|
||||
int slot = mc.player.getInventory().findSlotMatchingItem(tool);
|
||||
if (!Inventory.isHotbarSlot(slot)) continue; // skip anything outside the hotbar
|
||||
|
||||
Tool toolComponent = tool.get(DataComponents.TOOL);
|
||||
if (toolComponent != null) {
|
||||
speeds.put(toolComponent.getMiningSpeed(state), tool);
|
||||
@@ -193,4 +207,13 @@ public class AutoTool extends Module {
|
||||
finishedMining = false;
|
||||
switchBackDelay = 0;
|
||||
}
|
||||
|
||||
private enum AutoToolMode {
|
||||
ON_TICK("cada tick"),
|
||||
ON_CLICK("cada click");
|
||||
|
||||
private final String name;
|
||||
AutoToolMode(String name) { this.name = name; }
|
||||
@Override public String toString() { return name; }
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package me.retucio.sputnik.module.modules.world;
|
||||
import me.retucio.sputnik.module.Category;
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.util.EntityUtil;
|
||||
import me.retucio.sputnik.util.RotationUtil;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.monster.EnderMan;
|
||||
|
||||
@@ -52,10 +53,6 @@ public class Racist extends Module {
|
||||
}
|
||||
|
||||
private void lookAtEnderman(EnderMan enderman) {
|
||||
double yaw = EntityUtil.getYaw(enderman);
|
||||
double pitch = EntityUtil.getPitch(enderman, EntityUtil.Target.HEAD);
|
||||
|
||||
mc.player.setYRot((float) yaw);
|
||||
mc.player.setXRot((float) pitch);
|
||||
RotationUtil.lookAt(RotationUtil.LOW, enderman, EntityUtil.Target.HEAD, 0, RotationUtil.Mode.CLIENT);
|
||||
}
|
||||
}
|
||||
@@ -143,7 +143,8 @@ public abstract class Setting<T> {
|
||||
|
||||
public void fireUpdateEvent() {
|
||||
Sputnik.EVENT_BUS.post(
|
||||
new UpdateSettingEvent(this, getModule().shouldSaveSettings()));
|
||||
new UpdateSettingEvent(this, getModule().shouldSaveSettings())
|
||||
);
|
||||
}
|
||||
|
||||
public void onUpdate(Consumer<T> listener) {
|
||||
|
||||
@@ -223,7 +223,7 @@ public class ColorSetting extends Setting<Color> {
|
||||
return defaultRainbowSpeed;
|
||||
}
|
||||
|
||||
public int getRGB() {
|
||||
public int getRgb() {
|
||||
return getValue().getRGB();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package me.retucio.sputnik.module.setting.settings;
|
||||
|
||||
import me.retucio.sputnik.module.setting.Setting;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.I18nUtil;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
|
||||
public class FileSetting extends Setting<String> {
|
||||
|
||||
private File file;
|
||||
|
||||
public FileSetting(String name, String description, String defaultValue) {
|
||||
super(name, description, defaultValue);
|
||||
file = new File(defaultValue);
|
||||
}
|
||||
|
||||
public boolean isDirectory() {
|
||||
return file.isDirectory();
|
||||
}
|
||||
|
||||
public boolean exists() {
|
||||
return file.exists();
|
||||
}
|
||||
|
||||
public boolean canWrite() {
|
||||
return file.canWrite();
|
||||
}
|
||||
|
||||
public File getFile() {
|
||||
return file;
|
||||
}
|
||||
|
||||
public String getFilename() {
|
||||
return file.getName();
|
||||
}
|
||||
|
||||
public Path getPath() {
|
||||
return Path.of(file.getPath());
|
||||
}
|
||||
|
||||
public String getAbsPathStr() {
|
||||
return file.getAbsolutePath();
|
||||
}
|
||||
|
||||
public String getRelPathStr() {
|
||||
return file.getPath();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setValue(String value) {
|
||||
super.setValue(value);
|
||||
file = new File(value);
|
||||
if (!exists()) {
|
||||
ChatUtil.error(I18nUtil.fmt(
|
||||
"sputnik.filesetting.doesnotexist",
|
||||
"el archivo \"%s\" no existe!".formatted(value),
|
||||
value
|
||||
));
|
||||
}
|
||||
|
||||
if (!canWrite()) {
|
||||
if (!exists()) {
|
||||
ChatUtil.warn(I18nUtil.fmt(
|
||||
"sputnik.filesetting.cannotwrite",
|
||||
"no se puede escribir a \"%s\"!".formatted(value),
|
||||
value
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -88,9 +88,7 @@ public class OptionSetting<T> extends Setting<T> {
|
||||
return displayNames;
|
||||
}
|
||||
|
||||
// OJO: nombre interno de la opción, o sea la clave de la config. (ver ClientConfig
|
||||
// #onUpdateSetting). igual que en ListSetting, para las listas del juego es la clave
|
||||
// de traducción. no traducir
|
||||
// no traducir.
|
||||
public String getConfigName(T key) {
|
||||
if (displayNames != null && displayNames.containsKey(key)) return displayNames.get(key);
|
||||
return key != null ? key.toString() : "?";
|
||||
|
||||
@@ -0,0 +1,155 @@
|
||||
package me.retucio.sputnik.ui.hud;
|
||||
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
// editor de elementos del hud, compartido entre su propia pantalla y la pestaña de la interfaz
|
||||
public class HudEditor {
|
||||
|
||||
public static HudEditor INSTANCE;
|
||||
|
||||
private static final Minecraft mc = Minecraft.getInstance();
|
||||
|
||||
private final List<HudElement> elements = new ArrayList<>();
|
||||
@Nullable private HudElement selected = null;
|
||||
|
||||
private boolean dragging = false;
|
||||
private int dragX, dragY;
|
||||
|
||||
public void setElements(List<HudElement> elements) {
|
||||
this.elements.clear();
|
||||
this.elements.addAll(elements);
|
||||
}
|
||||
|
||||
public void render(GuiGraphicsExtractor gui, int mouseX, int mouseY) {
|
||||
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
|
||||
|
||||
if (hud.axialMovement.getValue() && dragging && selected != null) {
|
||||
int centerX = mc.getWindow().getGuiScaledWidth() / 2;
|
||||
if (Math.abs(centerX - mouseX) < hud.axisOffset.getValue()) {
|
||||
dragX = mouseX - centerX + selected.getW() / 2;
|
||||
gui.verticalLine(centerX, 0, mc.getWindow().getGuiScaledHeight(), Colors.CELESTE.getRGB());
|
||||
}
|
||||
|
||||
int centerY = mc.getWindow().getGuiScaledHeight() / 2;
|
||||
if (Math.abs(centerY - mouseY) < hud.axisOffset.getValue()) {
|
||||
dragY = mouseY - centerY + selected.getH() / 2;
|
||||
gui.horizontalLine(0, mc.getWindow().getGuiScaledWidth(), centerY, Colors.CELESTE.getRGB());
|
||||
}
|
||||
}
|
||||
|
||||
for (HudElement element : elements) element.renderInEditor(gui, hud);
|
||||
|
||||
if (dragging) return;
|
||||
|
||||
for (HudElement element : elements) {
|
||||
if (!element.isVisible() || !element.isHovered(mouseX, mouseY)) continue;
|
||||
|
||||
List<Component> tooltip = element.getTooltip();
|
||||
if (!tooltip.isEmpty())
|
||||
gui.setComponentTooltipForNextFrame(mc.font, tooltip, mouseX + 7, mouseY + 20);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean mouseClicked(int mouseX, int mouseY, int button) {
|
||||
for (HudElement element : elements) {
|
||||
if (!element.isHovered(mouseX, mouseY)) continue;
|
||||
selected = element;
|
||||
|
||||
if (button == 0) {
|
||||
dragging = true;
|
||||
dragX = mouseX - element.getX();
|
||||
dragY = mouseY - element.getY();
|
||||
|
||||
elements.remove(element);
|
||||
elements.add(element);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (button == 1) {
|
||||
if (KeyUtil.isShiftDown()) selected.resetPosition();
|
||||
else selected.setVisible(!selected.isVisible());
|
||||
|
||||
saveElement(selected);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean mouseDragged(int mouseX, int mouseY, int button) {
|
||||
if (!dragging || selected == null || button != 0) return false;
|
||||
|
||||
int width = mc.getWindow().getGuiScaledWidth();
|
||||
int height = mc.getWindow().getGuiScaledHeight();
|
||||
|
||||
selected.setPosition(
|
||||
Math.clamp(mouseX - dragX, 1, width - selected.getW() - 1),
|
||||
Math.clamp(mouseY - dragY, 1, height - selected.getH() - 1));
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean mouseReleased(int button) {
|
||||
if (dragging && button == 0) {
|
||||
dragging = false;
|
||||
if (selected != null) saveElement(selected);
|
||||
return true;
|
||||
}
|
||||
|
||||
selected = null;
|
||||
return false;
|
||||
}
|
||||
|
||||
public void onKey(int key) {
|
||||
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
|
||||
if (!hud.arrowMovement.getValue() || selected == null) return;
|
||||
|
||||
int offset = hud.arrowOffset.getIntValue();
|
||||
switch (key) {
|
||||
case GLFW.GLFW_KEY_UP -> selected.setY(Math.max(1, selected.getY() - offset));
|
||||
case GLFW.GLFW_KEY_DOWN -> selected.setY(Math.min(
|
||||
mc.getWindow().getGuiScaledHeight() - selected.getH() + 1, selected.getY() + offset));
|
||||
case GLFW.GLFW_KEY_LEFT -> selected.setX(Math.max(1, selected.getX() - offset));
|
||||
case GLFW.GLFW_KEY_RIGHT -> selected.setX(Math.min(
|
||||
mc.getWindow().getGuiScaledWidth() - selected.getW() + 1, selected.getX() + offset));
|
||||
}
|
||||
}
|
||||
|
||||
public void saveAll() {
|
||||
for (HudElement element : elements) writeElement(element);
|
||||
ConfigManager.INSTANCE.save();
|
||||
}
|
||||
|
||||
private void saveElement(HudElement element) {
|
||||
writeElement(element);
|
||||
ConfigManager.INSTANCE.save();
|
||||
}
|
||||
|
||||
private static void writeElement(HudElement element) {
|
||||
ConfigManager.INSTANCE.setHudPosition(element.getId(), element.getX(), element.getY());
|
||||
ConfigManager.INSTANCE.setHudVisibility(element.getId(), element.isVisible());
|
||||
}
|
||||
|
||||
public boolean isSelected(HudElement element) {
|
||||
return selected == element;
|
||||
}
|
||||
|
||||
public void unselect() {
|
||||
selected = null;
|
||||
dragging = false;
|
||||
}
|
||||
}
|
||||
@@ -1,200 +1,77 @@
|
||||
package me.retucio.sputnik.ui.hud;
|
||||
|
||||
import com.github.retucio.neutrino.EventListener;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.event.input.KeyEvent;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import me.retucio.sputnik.util.KeyUtil;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.input.MouseButtonEvent;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jspecify.annotations.NonNull;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class HudEditorScreen extends Screen {
|
||||
|
||||
public static HudEditorScreen INSTANCE;
|
||||
private final Minecraft mc = Minecraft.getInstance();
|
||||
private final Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
|
||||
|
||||
private final List<HudElement> elements = new ArrayList<>();
|
||||
@Nullable private HudElement selected = null;
|
||||
|
||||
private boolean dragging = false;
|
||||
private int dragX, dragY;
|
||||
|
||||
public HudEditorScreen() {
|
||||
super(Component.translatable("sputnik.hud.editor.title"));
|
||||
Sputnik.EVENT_BUS.subscribe(this);
|
||||
}
|
||||
|
||||
public void setElements(List<HudElement> elements) {
|
||||
this.elements.clear();
|
||||
this.elements.addAll(elements);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void extractRenderState(GuiGraphicsExtractor gui, int mouseX, int mouseY, float delta) {
|
||||
gui.fill(0, 0, this.width, this.height, Colors.hudEditorScreenBackgroundColor.getRGB());
|
||||
|
||||
// instrucciones
|
||||
gui.centeredText(mc.font, title, this.width / 2, this.height / 2 - mc.font.lineHeight, -1);
|
||||
gui.centeredText(mc.font,
|
||||
Component.translatable("sputnik.hud.editor.instructions"),
|
||||
this.width / 2, this.height / 2 + mc.font.lineHeight, Colors.instructionsTextColor.getRGB());
|
||||
|
||||
// movimiento axial
|
||||
if (hud.axialMovement.getValue()) {
|
||||
int centerX = mc.getWindow().getGuiScaledWidth() / 2;
|
||||
if (dragging && selected != null && Math.abs(centerX - mouseX) < hud.axisOffset.getValue()) {
|
||||
dragX = mouseX - centerX + selected.getW() / 2;
|
||||
gui.verticalLine(centerX, 0, mc.getWindow().getGuiScaledHeight(), Colors.CELESTE.getRGB());
|
||||
}
|
||||
|
||||
int centerY = mc.getWindow().getGuiScaledHeight() / 2;
|
||||
if (dragging && selected != null && Math.abs(centerY - mouseY) < hud.axisOffset.getValue()) {
|
||||
dragY = mouseY - centerY + selected.getH() / 2;
|
||||
gui.horizontalLine(0, mc.getWindow().getGuiScaledWidth(), centerY, Colors.CELESTE.getRGB());
|
||||
}
|
||||
}
|
||||
|
||||
// elementos
|
||||
for (HudElement element : elements) {
|
||||
element.renderInEditor(gui, hud);
|
||||
}
|
||||
|
||||
// tooltips
|
||||
if (!dragging) {
|
||||
for (HudElement element : elements) {
|
||||
if (!element.isVisible()) continue;
|
||||
|
||||
if (element.isHovered(mouseX, mouseY)) {
|
||||
List<Component> tooltip = element.getTooltip();
|
||||
if (!tooltip.isEmpty())
|
||||
gui.setComponentTooltipForNextFrame(mc.font, tooltip, mouseX + 7, mouseY + 20);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
HudEditor.INSTANCE.render(gui, mouseX, mouseY);
|
||||
|
||||
super.extractRenderState(gui, mouseX, mouseY, delta);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseClicked(@NonNull MouseButtonEvent click, boolean doubled) {
|
||||
int mouseX = (int) click.x();
|
||||
int mouseY = (int) click.y();
|
||||
|
||||
for (HudElement element : elements) {
|
||||
if (element.isHovered(mouseX, mouseY)) {
|
||||
selected = element;
|
||||
|
||||
if (click.button() == 0) {
|
||||
dragging = true;
|
||||
dragX = mouseX - element.getX();
|
||||
dragY = mouseY - element.getY();
|
||||
|
||||
elements.remove(element);
|
||||
elements.add(element);
|
||||
return true;
|
||||
|
||||
} else if (click.button() == 1) {
|
||||
if (KeyUtil.isShiftDown()) {
|
||||
selected.resetPosition();
|
||||
} else {
|
||||
selected.setVisible(!selected.isVisible());
|
||||
}
|
||||
saveElementToConfig(selected);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (HudEditor.INSTANCE.mouseClicked((int) click.x(), (int) click.y(), click.button())) return true;
|
||||
return super.mouseClicked(click, doubled);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseDragged(@NonNull MouseButtonEvent click, double deltaX, double deltaY) {
|
||||
if (!dragging || selected == null || click.button() != 0)
|
||||
return super.mouseDragged(click, deltaX, deltaY);
|
||||
|
||||
int mouseX = (int) click.x();
|
||||
int mouseY = (int) click.y();
|
||||
|
||||
int newX = mouseX - dragX;
|
||||
int newY = mouseY - dragY;
|
||||
|
||||
newX = Math.clamp(newX, 1, width - selected.getW() - 1);
|
||||
newY = Math.clamp(newY, 1, height - selected.getH() - 1);
|
||||
|
||||
selected.setPosition(newX, newY);
|
||||
return true;
|
||||
if (HudEditor.INSTANCE.mouseDragged((int) click.x(), (int) click.y(), click.button())) return true;
|
||||
return super.mouseDragged(click, deltaX, deltaY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseReleased(@NonNull MouseButtonEvent click) {
|
||||
if (dragging && click.button() == 0) {
|
||||
dragging = false;
|
||||
if (selected != null)
|
||||
saveElementToConfig(selected);
|
||||
return true;
|
||||
}
|
||||
|
||||
selected = null;
|
||||
if (HudEditor.INSTANCE.mouseReleased(click.button())) return true;
|
||||
return super.mouseReleased(click);
|
||||
}
|
||||
|
||||
// he sustituído el método del súper por un evento para ver si así se podían
|
||||
// registrar dos teclas a la vez, pero resulta que no :P
|
||||
@EventListener
|
||||
public void onKey(KeyEvent event) {
|
||||
if (!(mc.gui.screen() == INSTANCE)) return;
|
||||
if (mc.gui.screen() != INSTANCE) return;
|
||||
if (event.getAction() == GLFW.GLFW_RELEASE) return;
|
||||
event.cancel();
|
||||
|
||||
// guardar y salir
|
||||
if (event.getKey() == GLFW.GLFW_KEY_ESCAPE) {
|
||||
saveAllElementsToConfig();
|
||||
selected = null;
|
||||
HudEditor.INSTANCE.saveAll();
|
||||
HudEditor.INSTANCE.unselect();
|
||||
mc.gui.setScreen(null);
|
||||
return;
|
||||
}
|
||||
// movimiento de los elementos con las teclas de las flechas
|
||||
else if (hud.arrowMovement.getValue() && selected != null) {
|
||||
int offset = hud.arrowOffset.getIntValue();
|
||||
if (event.getKey() == GLFW.GLFW_KEY_UP) {
|
||||
selected.setY(Math.max(1, selected.getY() - offset));
|
||||
}
|
||||
if (event.getKey() == GLFW.GLFW_KEY_DOWN) {
|
||||
selected.setY(Math.min(mc.getWindow().getGuiScaledHeight() - selected.getH() + 1, selected.getY() + offset));
|
||||
}
|
||||
if (event.getKey() == GLFW.GLFW_KEY_LEFT) {
|
||||
selected.setX(Math.max(1, selected.getX() - offset));
|
||||
}
|
||||
if (event.getKey() == GLFW.GLFW_KEY_RIGHT) {
|
||||
selected.setX(Math.min(mc.getWindow().getGuiScaledWidth() - selected.getW() + 1, selected.getX() + offset));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void saveElementToConfig(HudElement element) {
|
||||
ConfigManager.INSTANCE.setHudPosition(element.getId(), element.getX(), element.getY());
|
||||
ConfigManager.INSTANCE.setHudVisibility(element.getId(), element.isVisible());
|
||||
ConfigManager.INSTANCE.save();
|
||||
}
|
||||
|
||||
private void saveAllElementsToConfig() {
|
||||
for (HudElement element : elements) {
|
||||
saveElementToConfig(element);
|
||||
}
|
||||
HudEditor.INSTANCE.onKey(event.getKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -203,8 +80,4 @@ public class HudEditorScreen extends Screen {
|
||||
super.extractBlurredBackground(gui);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isSelected(HudElement element) {
|
||||
return selected == element;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import me.retucio.sputnik.config.ConfigManager;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.hud.elements.*;
|
||||
import me.retucio.sputnik.ui.screen.ClickGui;
|
||||
import me.retucio.sputnik.ui.widgets.misc.NotificationWidget;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -35,38 +36,46 @@ public class HudRenderer {
|
||||
Map<String, int[]> positions = ConfigManager.INSTANCE.getConfig().hudPositions;
|
||||
Map<String, Boolean> visibilities = ConfigManager.INSTANCE.getConfig().hudVisibilities;
|
||||
|
||||
addElement(new CoordsElement(), positions, visibilities);
|
||||
addElement(new FpsElement(), positions, visibilities);
|
||||
addElement(new TpsElement(), positions, visibilities);
|
||||
addElement(new CustomTextElement(), positions, visibilities);
|
||||
addElement(new PingElement(), positions, visibilities);
|
||||
addElement(new RotationElement(), positions, visibilities);
|
||||
addElement(new TimeElement(), positions, visibilities);
|
||||
addElement(new UptimeElement(), positions, visibilities);
|
||||
addElement(new CoordsElement(), positions, visibilities, true);
|
||||
addElement(new FpsElement(), positions, visibilities, true);
|
||||
addElement(new TpsElement(), positions, visibilities, false);
|
||||
addElement(new CustomTextElement(), positions, visibilities, false);
|
||||
addElement(new PingElement(), positions, visibilities, true);
|
||||
addElement(new RotationElement(), positions, visibilities, false);
|
||||
addElement(new TimeElement(), positions, visibilities, true);
|
||||
addElement(new UptimeElement(), positions, visibilities, false);
|
||||
addElement(new SpeedElement(), positions, visibilities, false);
|
||||
addElement(new ArrayListElement(), positions, visibilities, true);
|
||||
|
||||
addElement(new DynoElement(), positions, visibilities);
|
||||
addElement(new EchestElement(), positions, visibilities);
|
||||
addElement(new TotemsElement(), positions, visibilities);
|
||||
addElement(new ArmorElement(), positions, visibilities);
|
||||
addElement(new DynoElement(), positions, visibilities, false);
|
||||
addElement(new EchestElement(), positions, visibilities, false);
|
||||
addElement(new TotemsElement(), positions, visibilities, true);
|
||||
addElement(new ArmorElement(), positions, visibilities, true);
|
||||
addElement(new CustomImageElement(), positions, visibilities, false);
|
||||
|
||||
HudEditorScreen.INSTANCE.setElements(elements);
|
||||
HudEditor.INSTANCE.setElements(elements);
|
||||
}
|
||||
|
||||
private void addElement(HudElement element, Map<String, int[]> positions, Map<String, Boolean> visibilities) {
|
||||
private void addElement(HudElement element, Map<String, int[]> positions, Map<String, Boolean> visibilities, boolean defVisible) {
|
||||
int[] savedPos;
|
||||
|
||||
if (positions.get(element.getId()) == null)
|
||||
if (positions.get(element.getId()) == null) {
|
||||
savedPos = new int[] {element.defaultX, element.defaultY};
|
||||
else
|
||||
} else {
|
||||
savedPos = positions.get(element.getId());
|
||||
}
|
||||
|
||||
Boolean savedVisibility = visibilities.get(element.getId());
|
||||
|
||||
if (savedPos != null)
|
||||
if (savedPos != null) {
|
||||
element.setPosition(savedPos[0], savedPos[1]);
|
||||
}
|
||||
|
||||
if (savedVisibility != null)
|
||||
if (savedVisibility != null) {
|
||||
element.setVisible(savedVisibility);
|
||||
} else {
|
||||
element.setVisible(defVisible);
|
||||
}
|
||||
|
||||
elements.add(element);
|
||||
}
|
||||
@@ -130,7 +139,8 @@ public class HudRenderer {
|
||||
|| !hud.isEnabled()
|
||||
|| (mc.debugEntries.isOverlayVisible() && !hud.showOnF3.getValue())
|
||||
|| (mc.gui.screen() instanceof ChatScreen && !hud.showOnChat.getValue())
|
||||
|| mc.gui.screen() instanceof HudEditorScreen;
|
||||
|| mc.gui.screen() instanceof HudEditorScreen
|
||||
|| (ClickGui.INSTANCE != null && mc.gui.screen() == ClickGui.INSTANCE && ClickGui.INSTANCE.isOnHudTab());
|
||||
}
|
||||
|
||||
public void pushNotification(String title, String desc) {
|
||||
|
||||
@@ -3,6 +3,7 @@ package me.retucio.sputnik.ui.hud;
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
import me.retucio.sputnik.Sputnik;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.util.ChatUtil;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.renderer.RenderPipelines;
|
||||
@@ -35,7 +36,9 @@ public abstract class ImageHudElement extends HudElement {
|
||||
public void reloadTexture() {
|
||||
textureLoaded = false;
|
||||
String imagePath = getImagePath();
|
||||
if (imagePath == null || imagePath.isEmpty()) return;
|
||||
if (imagePath == null || imagePath.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
// cargar
|
||||
@@ -65,12 +68,18 @@ public abstract class ImageHudElement extends HudElement {
|
||||
}
|
||||
} catch (Exception e) {
|
||||
Sputnik.LOGGER.error(Component.translatable("sputnik.hud.error.texture", getId(), e.getMessage()).getString());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInGame(GuiGraphicsExtractor gui, float delta, Hud hud) {
|
||||
if (!textureLoaded || !isVisible()) return;
|
||||
if (getImagePath() == null || getImagePath().isEmpty()) {
|
||||
return;
|
||||
}
|
||||
if (!textureLoaded || !isVisible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
gui.blit(
|
||||
RenderPipelines.GUI_TEXTURED,
|
||||
@@ -109,7 +118,7 @@ public abstract class ImageHudElement extends HudElement {
|
||||
|
||||
protected void drawEditorBackground(GuiGraphicsExtractor gui) {
|
||||
int bgColor = visible ? Colors.visibleHudElementColor.getRGB() : Colors.disabledHudElementColor.getRGB();
|
||||
int outlineColor = HudEditorScreen.INSTANCE != null && HudEditorScreen.INSTANCE.isSelected(this)
|
||||
int outlineColor = HudEditor.INSTANCE != null && HudEditor.INSTANCE.isSelected(this)
|
||||
? Colors.selectedHudElementOutlineColor.getRGB()
|
||||
: Colors.unselectedHudElementOutlineColor.getRGB();
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public abstract class TextHudElement extends HudElement {
|
||||
|
||||
protected void drawEditorBackground(GuiGraphicsExtractor gui) {
|
||||
int bgColor = visible ? Colors.visibleHudElementColor.getRGB() : Colors.disabledHudElementColor.getRGB();
|
||||
int outlineColor = HudEditorScreen.INSTANCE != null && HudEditorScreen.INSTANCE.isSelected(this)
|
||||
int outlineColor = HudEditor.INSTANCE != null && HudEditor.INSTANCE.isSelected(this)
|
||||
? Colors.selectedHudElementOutlineColor.getRGB()
|
||||
: Colors.unselectedHudElementOutlineColor.getRGB();
|
||||
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
package me.retucio.sputnik.ui.hud.elements;
|
||||
|
||||
import me.retucio.sputnik.module.Module;
|
||||
import me.retucio.sputnik.module.ModuleManager;
|
||||
import me.retucio.sputnik.module.modules.client.Hud;
|
||||
import me.retucio.sputnik.ui.hud.HudElement;
|
||||
import me.retucio.sputnik.ui.hud.HudEditor;
|
||||
import me.retucio.sputnik.ui.hud.HudRenderer;
|
||||
import me.retucio.sputnik.util.Colors;
|
||||
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class ArrayListElement extends HudElement {
|
||||
|
||||
public ArrayListElement() {
|
||||
super("arraylist", 2, 2);
|
||||
}
|
||||
|
||||
private List<Module> getSortedModules() {
|
||||
List<Module> sorted = ModuleManager.INSTANCE.getModules().stream()
|
||||
.filter(Module::isEnabled)
|
||||
.sorted(Comparator.comparingInt((Module m) -> mc.font.width(m.getName())))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return isLowerHalf()
|
||||
? sorted
|
||||
: sorted.reversed();
|
||||
}
|
||||
|
||||
private boolean isRightHalf() {
|
||||
return x > mc.getWindow().getGuiScaledWidth() / 2;
|
||||
}
|
||||
|
||||
private boolean isLowerHalf() {
|
||||
return y > mc.getWindow().getGuiScaledHeight() / 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInGame(GuiGraphicsExtractor gui, float delta, Hud hud) {
|
||||
List<Module> modules = getSortedModules();
|
||||
boolean shadow = hud != null && hud.shadow.getValue();
|
||||
int lineHeight = mc.font.lineHeight + 1;
|
||||
|
||||
if (modules.isEmpty()) {
|
||||
w = 0;
|
||||
h = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
boolean rightAlign = isRightHalf();
|
||||
int maxWidth = mc.font.width(modules.getFirst().getDisplayName()); // widest = first
|
||||
int currY = y;
|
||||
|
||||
for (Module module : modules) {
|
||||
if (!module.isVisible()) continue;
|
||||
|
||||
String name = module.getDisplayName();
|
||||
int textWidth = mc.font.width(name);
|
||||
int drawX = rightAlign
|
||||
? x + (maxWidth - textWidth)
|
||||
: x;
|
||||
|
||||
int color = module.getArraylistColor().getRGB();
|
||||
HudRenderer.INSTANCE.drawSnappedText(gui, name, drawX, currY, color, shadow);
|
||||
|
||||
currY += lineHeight;
|
||||
}
|
||||
|
||||
w = maxWidth;
|
||||
h = currY - y - 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInEditor(GuiGraphicsExtractor gui, Hud hud) {
|
||||
drawEditorBackground(gui);
|
||||
renderInGame(gui, 0, hud);
|
||||
}
|
||||
|
||||
protected void drawEditorBackground(GuiGraphicsExtractor gui) {
|
||||
int bgColor = visible ? Colors.visibleHudElementColor.getRGB() : Colors.disabledHudElementColor.getRGB();
|
||||
int outlineColor = HudEditor.INSTANCE != null && HudEditor.INSTANCE.isSelected(this)
|
||||
? Colors.selectedHudElementOutlineColor.getRGB()
|
||||
: Colors.unselectedHudElementOutlineColor.getRGB();
|
||||
|
||||
gui.fill(x - 1, y - 1, x + w + 1, y + h + 1, bgColor);
|
||||
gui.fill(x - 1, y - 1, x + w + 1, y, outlineColor);
|
||||
gui.fill(x - 1, y + h, x + w + 1, y + h + 1, outlineColor);
|
||||
gui.fill(x - 1, y, x, y + h, outlineColor);
|
||||
gui.fill(x + w, y, x + w + 1, y + h, outlineColor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Component> getTooltip() {
|
||||
return List.of(
|
||||
Component.translatable("sputnik.hud.element.arraylist.name"),
|
||||
Component.translatable("sputnik.hud.element.arraylist.desc")
|
||||
);
|
||||
}
|
||||
}
|
||||
Loaded 100 of 121 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user