Compare commits

...
8 Commits
Author SHA1 Message Date
retucio 629d03ff92 v6.5 2026-09-14 19:17:07 +02:00
retucio c1a03f3ddb v6.4 2026-09-06 11:55:58 +02:00
retucio 44494830be v6.3 2026-09-04 12:58:41 +02:00
retucio 73682cb85d v6.2 2026-08-28 12:27:07 +02:00
retucio ac7de7a07a v6.1 2026-08-27 01:00:19 +02:00
retucio 0bd31971a0 v6.0 2026-08-23 16:50:27 +02:00
retucio 3010b164ab v5.9 2026-08-23 16:03:32 +02:00
retucio 6cb4656365 v5.8 2026-08-22 18:20:52 +02:00
116 changed files with 3595 additions and 714 deletions

No files matched your search

+82
View File
@@ -0,0 +1,82 @@
<p align="center">
<a href="README.md"><img src="https://img.shields.io/badge/lang-Español-yellow.svg" alt="español"></a>
<a href="README.en.md"><img src="https://img.shields.io/badge/lang-English-blue.svg" alt="english"></a>
</p>
# jenny's mod 2 (100% real)
> Minecraft Fabric 26.2 mod that adds some "QOL" features, mostly related to the camera.
## installation
### for normal people:
1. go to [releases](https://codeberg.org/retucio/sputnik/releases)
2. choose the most recent version
3. download the .jar file
4. move it to your mods dir (prolly `%appdata%/.minecraft/mods`)
make sure to have a Minecraft and Fabric version compatible with the mod (MC `26.2`; Fabric `0.19.3`)
issues could arise when using it with other mods, especially other clients, since they could conflict
### for nerds
1. clone the repo (`git clone https://codeberg.org/retucio/sputnik`)
2. enter the repo dir (`cd sputnik`)
3. `gradlew build` for Windows (ew) or `chmod +x gradlew` + `./gradlew build` for Unix-likes (Linux & Mac)
4. the built .jar will be found in `/build/libs/sputnik-X.X.jar`
## usage
`rshift` by default to open the GUI
`insert` by default to open the HUD editor
`$` as prefix for commands (autocompleted)
some modules have keys assigned by default, assign them `ESC` to unbind them.
## ui
- left click to toggle modules
- right click to open its settings
- left click + drag to move a panel
- right click on a panel's header to expand/contract it, or to close it
- left click over settings to change them
- shift + right click on a setting to reset it to its default value
- place the mouse cursor over a module/setting to read its description
## screenshots
<img src="screenshots/automine.png" alt="auto mine">
<img src="screenshots/blockesp.png" alt="block ESP + light overlay">
<img src="screenshots/camtweaks.png" alt="perspective plus">
<img src="screenshots/chatplus.png" alt="chatplus + nametags + screenshots plus">
<img src="screenshots/clickgui.png" alt="click GUI">
<img src="screenshots/freecam.png" alt="freecam + tracers">
<img src="screenshots/hudeditor.png" alt="HUD editor">
<img src="screenshots/itemphysics.png" alt="item physics">
<img src="screenshots/lsd.png" alt="lsd module">
<img src="screenshots/macros.png" alt="macros tab">
<img src="screenshots/trajectories.png" alt="projectile trajectories">
## contribution
yes please (PRs are welcome)
## license
[CC0 license](LICENSE)
## disclaimer
i don't give a single fuck what happens to you when using this mod on servers where its features are bannable and such.
## deps
- [fabric api](https://modrinth.com/mod/fabric-api/)
## notes
this mod IS BUGGY. VERY BUGGY, i know. i started this project when i was 14 and the codebase is such a mess i refuse to fix it. i might rewrite it in a future, though.
+29 -37
View File
@@ -1,23 +1,28 @@
<p align="center">
<a href="README.md"><img src="https://img.shields.io/badge/lang-Español-yellow.svg" alt="español"></a>
<a href="README.en.md"><img src="https://img.shields.io/badge/lang-English-blue.svg" alt="english"></a>
</p>
# jenny's mod 2 100% real # 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 ## instalación
### para gente normal: ### 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 2. selecionar la versión más reciente
3. descargar el .jar 3. descargar el .jar
4. moverlo a tu directorio de mods (probablemente `%appdata%/.minecraft/mods`) 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. 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 ### para frikis de 200 de iq
1. clona el respositorio (`git clone https://github.com/retuci0/sputnik`) 1. clona el respositorio (`git clone https://codeberg.org/retucio/sputnik`)
2. entra al directorio del repositorio (`cd sputnik`) 2. entra al directorio del repositorio (`cd sputnik`)
3. `gradlew build` para Windows o `chmod +x gradlew` + `./gradlew build` para Linux (Mac es Linux) 3. `gradlew build` para Windows (ew) o `chmod +x gradlew` + `./gradlew build` para Unix-likes (Linux & Mac)
4. el resultado estará en `/build/libs/sputnik-X.X.jar` (el que no lleva "sources" en el nombre) 4. el resultado estará en `/build/libs/sputnik-X.X.jar`
## uso ## uso
@@ -33,55 +38,42 @@ algunos módulos tienen teclas asignadas por defecto, asígnales `ESC` para desa
- clic izquierdo para activar / desactivar módulos - clic izquierdo para activar / desactivar módulos
- clic derecho para abrir sus ajustes - clic derecho para abrir sus ajustes
- clic izquierdo + arrastrar para mover marcos - clic izquierdo + arrastrar para mover paneles
- clic derecho en la cabeza del marco para expandirlo / contraerlo o para cerrarlo - clic derecho en la cabeza del marco para expandirlo / contraerlo o para cerrarlo
- clic izquierdo sobre ajustes para modificarlos - clic izquierdo sobre ajustes para modificarlos
- shift + clic derecho sobre ajustes para restablecerlos - shift + clic derecho sobre ajustes para restablecerlos
- posiciona el puntero del ratón sobre un módulo o ajuste para leer su descripción - posiciona el puntero del ratón sobre un módulo o ajuste para leer su descripción
### protips
- shift mientras pasas el puntero por encima de un ajuste de modos para ver los modos disponibles
- clic derecho para ciclar hacia atrás en ajustes de modo
- usa la rueda del ratón para mover la interfaz verticalmente
- shift + rueda del ratón para mover todos los marcos a un rango visible en la pantalla
## capturas ## capturas
<img src="screenshots/ui.png" alt="interfaz"> <img src="screenshots/automine.png" alt="auto minado">
<img src="screenshots/nametags.png" alt="nametags mostrando daño de un tridente"> <img src="screenshots/blockesp.png" alt="resaltado de bloques + superposición de luz">
<img src="screenshots/chatplus.png" alt="chatplus y capturas en uso"> <img src="screenshots/camtweaks.png" alt="perspectiva plus">
<img src="screenshots/crits.png" alt="críticos"> <img src="screenshots/chatplus.png" alt="chatplus + nametags + capturas">
<img src="screenshots/fullbright.png" alt="fullbright en modo gamma cambiando el color de los shaders"> <img src="screenshots/clickgui.png" alt="interfaz">
<img src="screenshots/hud.png" alt="HUD"> <img src="screenshots/freecam.png" alt="cámara libre + trazos">
<img src="screenshots/hudeditor.png" alt="editor de HUD"> <img src="screenshots/hudeditor.png" alt="editor de HUD">
<img src="screenshots/colorpicker.png" alt="selector de colores"> <img src="screenshots/itemphysics.png" alt="físicas de items">
<img src="screenshots/lsd.png" alt="LSD">
<img src="screenshots/macros.png" alt="macros">
<img src="screenshots/trajectories.png" alt="trayectorias">
## contibuciones ## contribuciones
sí por favor sí por favor
## licencia ## licencia
no sé, haz lo que quieras con esto, es puta basura xd [licencia CC0](LICENSE)
aunque estaría guay que acreditases
pero bueno
## descargo de responsabilidad ## descargo de responsabilidad
me importa una puta mierda lo que pase al usar este mod en servers donde es baneable y así. me importa una puta mierda lo que pase al usar este mod en servers donde es baneable y así.
## mods recomendados ## dependencias
> mods que recomiendo usar junto a este: - [fabric api](https://modrinth.com/mod/fabric-api/)
- [fabric api (necesario)](https://modrinth.com/mod/fabric-api/): necesario para el mod ## notas
- [sodium](https://modrinth.com/mod/sodium): mejora el rendimiento general del juego
- [viafabricplus](https://modrinth.com/mod/viafabricplus): te permite conectarte a servidores que tengan una versión distinta a la de tu cliente este mod tiene MUCHOS bugs. empecé este proyecto cuando tenía 14 años y no sabía una mierda de programar. el código es un puto desastre y me niego a arreglarlo. puede que en un futuro reescriba el mod o algo. no sé.
- [xaero's world map](https://modrinth.com/mod/xaeros-world-map/) y [xaero's minimap](https://modrinth.com/mod/xaeros-minimap/): mapa chulo
- [mod menu](https://modrinth.com/mod/modmenu): lista de los mods instalados, y sus ajustes
- [iris](https://modrinth.com/mod/iris): shaders
- [lambdynamiclights](https://modrinth.com/mod/lambdynamiclights): iluminación dinámica
- [appleskin](https://modrinth.com/mod/appleskin/): información relacionada con la comida
- [baritone (desactualizado)](https://github.com/cabaletta/baritone): google maps para juego de cubos
+6 -22
View File
@@ -1,32 +1,16 @@
# v5.7 # v6.5
## novedades ## novedades
actualización a gradle 9.7.0
interfaz reorganizada en pestañas: módulos, hud, perfiles y macros
perfiles de configuración: guarda varias configs con nombre y cambia entre ellas sin reiniciar
macros: asigna una tecla a una lista de comandos o mensajes
### adiciones ### adiciones
#### módulos nuevos:
- cancelador de paquetes: evita que se envíen o reciban ciertos paquetes
#### comandos nuevos:
- `$?`: muestra los comandos disponibles y los describe
- `$perfil`: gestiona los perfiles de configuración
- `$macro`: gestiona las macros
### arreglos / mejoras ### arreglos / mejoras
- las rotaciones de los módulos se reparten por prioridad en vez de pisarse entre ellas - opción para cancelar la animación original para `progreso de minado`
- el editor del hud ya es una pestaña más de la interfaz, además de su propia pantalla - ahora los amigos se muestran en una pestaña separada en la interfaz
## problemas reconocidos ## problemas reconocidos
- lo de siempre. - `reponer` no funciona
- `copiar` tras sacar una captura con `capturas` no funciona correctamente
- \+ lo de siempre.
+1 -1
View File
@@ -10,6 +10,6 @@ discord_rpc_version=1.0.3
neutrino_version=1.1.0 neutrino_version=1.1.0
jdk_version=25 jdk_version=25
mod_version=5.7 mod_version=6.5
maven_group=me.retucio maven_group=me.retucio
archives_base_name=sputnik archives_base_name=sputnik
+2 -3
View File
@@ -1,7 +1,6 @@
#Sat Aug 29 22:10:52 CEST 2026
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 864 KiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 796 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 915 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 KiB

After

Width:  |  Height:  |  Size: 700 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 691 KiB

@@ -26,6 +26,7 @@ import me.retucio.sputnik.ui.hud.HudEditorScreen;
import me.retucio.sputnik.ui.screen.UpdateScreen; import me.retucio.sputnik.ui.screen.UpdateScreen;
import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton; import me.retucio.sputnik.ui.widgets.buttons.settings.BindButton;
import me.retucio.sputnik.ui.widgets.buttons.SettingButton; 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.buttons.settings.TextButton;
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel; import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
@@ -181,10 +182,15 @@ public class Sputnik implements ClientModInitializer {
// verifica si algún botón de ajustes está escuchando // verifica si algún botón de ajustes está escuchando
private boolean isAnySettingButtonFocused() { private boolean isAnySettingButtonFocused() {
if (ClickGui.INSTANCE == null) return false;
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels())
for (Button sb : sf.getButtons()) 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 true;
}
return false; return false;
} }
@@ -208,6 +214,7 @@ public class Sputnik implements ClientModInitializer {
for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) { for (SettingsPanel sf : ClickGui.INSTANCE.getSettingsPanels()) {
for (SettingButton<?> sb : sf.getButtons()) { for (SettingButton<?> sb : sf.getButtons()) {
if (sb instanceof BindButton bb) bb.onKey(key, action); 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); if (sb instanceof TextButton tb) tb.onKey(key, action);
} }
} }
@@ -3,12 +3,11 @@ package me.retucio.sputnik.command.commands;
import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import me.retucio.sputnik.command.Command; 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.gui.components.ChatComponent;
import net.minecraft.client.multiplayer.chat.GuiMessage; import net.minecraft.client.multiplayer.chat.GuiMessage;
import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.commands.SharedSuggestionProvider;
import java.awt.*;
import java.util.List; import java.util.List;
public class PurgeCommand extends Command { public class PurgeCommand extends Command {
@@ -14,7 +14,7 @@ import java.util.Map;
public class BinarySerializer { public class BinarySerializer {
private static final int MAGIC_NUMBER = 0x53505554; // "SPUT" private static final int MAGIC_NUMBER = 0x53505554; // "SPUT"
private static final int VERSION = 3; private static final int VERSION = 4;
private static final int MIN_VERSION = 2; private static final int MIN_VERSION = 2;
private static final byte TYPE_NULL = 0; private static final byte TYPE_NULL = 0;
@@ -72,7 +72,7 @@ public class BinarySerializer {
writeStringIntArrayMap(out, config.hudPositions); writeStringIntArrayMap(out, config.hudPositions);
writeStringBooleanMap(out, config.hudVisibilities); writeStringBooleanMap(out, config.hudVisibilities);
writeStringStringMap(out, config.hudImagePaths); writeStringStringMap(out, config.hudImagePaths);
writeStringStringMap(out, config.friends); writeFriendsMap(out, config.friends);
writeMacros(out, config.macros); writeMacros(out, config.macros);
writeString(out, config.currentProfile); writeString(out, config.currentProfile);
@@ -123,7 +123,9 @@ public class BinarySerializer {
Map<String, int[]> hudPositions = readStringIntArrayMap(in); Map<String, int[]> hudPositions = readStringIntArrayMap(in);
Map<String, Boolean> hudVisibilities = readStringBooleanMap(in); Map<String, Boolean> hudVisibilities = readStringBooleanMap(in);
Map<String, String> hudImagePaths = readStringStringMap(in); Map<String, String> hudImagePaths = readStringStringMap(in);
Map<String, String> friends = readStringStringMap(in); Map<String, ClientConfig.FriendData> friends = version >= 4
? readFriendsMap(in)
: migrateFriendsMap(readStringStringMap(in));
List<ClientConfig.MacroData> macros = version >= 3 ? readMacros(in) : new ArrayList<>(); List<ClientConfig.MacroData> macros = version >= 3 ? readMacros(in) : new ArrayList<>();
String currentProfile = version >= 3 ? readString(in) : ""; String currentProfile = version >= 3 ? readString(in) : "";
@@ -422,6 +424,45 @@ public class BinarySerializer {
return macros; return macros;
} }
private static void writeFriendsMap(DataOutputStream out, Map<String, ClientConfig.FriendData> map)
throws IOException {
if (map == null) {
out.writeInt(0);
return;
}
out.writeInt(map.size());
for (Map.Entry<String, ClientConfig.FriendData> entry : map.entrySet()) {
writeString(out, entry.getKey());
ClientConfig.FriendData data = entry.getValue();
writeString(out, data.name());
writeString(out, data.nick());
out.writeLong(data.befriendedAt());
}
}
private static Map<String, ClientConfig.FriendData> readFriendsMap(DataInputStream in)
throws IOException {
int size = in.readInt();
Map<String, ClientConfig.FriendData> map = new HashMap<>(size);
for (int i = 0; i < size; i++) {
String uuid = readString(in);
String name = readString(in);
String nick = readString(in);
long befriendedAt = in.readLong();
map.put(uuid, new ClientConfig.FriendData(name, nick, befriendedAt));
}
return map;
}
private static Map<String, ClientConfig.FriendData> migrateFriendsMap(Map<String, String> legacy) {
Map<String, ClientConfig.FriendData> map = new HashMap<>(legacy.size());
long now = System.currentTimeMillis();
for (Map.Entry<String, String> entry : legacy.entrySet()) {
map.put(entry.getKey(), new ClientConfig.FriendData(entry.getValue(), entry.getValue(), now));
}
return map;
}
private static void writeString(DataOutputStream out, String str) throws IOException { private static void writeString(DataOutputStream out, String str) throws IOException {
if (str == null) { if (str == null) {
out.writeInt(-1); out.writeInt(-1);
@@ -4,8 +4,6 @@ import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.sputnik.*; import me.retucio.sputnik.event.sputnik.*;
import me.retucio.sputnik.module.setting.settings.*; import me.retucio.sputnik.module.setting.settings.*;
import me.retucio.sputnik.ui.screen.ClickGui; import me.retucio.sputnik.ui.screen.ClickGui;
import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
import me.retucio.sputnik.util.ChatUtil;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@@ -44,8 +42,8 @@ public class ClientConfig {
// posición de la barra de búsqueda (x, y) // posición de la barra de búsqueda (x, y)
public int[] searchBarPosition = new int[] { 340, 16 }; public int[] searchBarPosition = new int[] { 340, 16 };
// amigos: uuid -> nombre // amigos: uuid -> FriendData (nombre, apodo, fecha)
public Map<String, String> friends = new HashMap<>(); public Map<String, FriendData> friends = new HashMap<>();
public List<MacroData> macros = new ArrayList<>(); public List<MacroData> macros = new ArrayList<>();
@@ -84,6 +82,7 @@ public class ClientConfig {
case ListSetting l: value = l.getConfigValues(); break; case ListSetting l: value = l.getConfigValues(); break;
case ColorSetting c: value = c.getConfigValue(); break; case ColorSetting c: value = c.getConfigValue(); break;
case OptionSetting o: value = o.getConfigName(); break; case OptionSetting o: value = o.getConfigName(); break;
case FileSetting f: value = f.getValue(); break;
default: break; default: break;
} }
@@ -145,31 +144,15 @@ public class ClientConfig {
ConfigManager.INSTANCE.markDirty(); ConfigManager.INSTANCE.markDirty();
} }
@EventListener
public void onExtendFriendsPanel(FriendPanelEvent.Extend event) {
extendablePanels.put("amigos", new PanelData(
ClickGui.INSTANCE.getFriendsPanel().getX(),
ClickGui.INSTANCE.getFriendsPanel().getY(),
ClickGui.INSTANCE.getFriendsPanel().isExtended()));
ConfigManager.INSTANCE.markDirty();
}
@EventListener
public void onMoveFriendsPanel(FriendPanelEvent.Move event) {
extendablePanels.put("amigos", new PanelData(
ClickGui.INSTANCE.getFriendsPanel().getX(),
ClickGui.INSTANCE.getFriendsPanel().getY(),
ClickGui.INSTANCE.getFriendsPanel().isExtended()));
ConfigManager.INSTANCE.markDirty();
}
@EventListener @EventListener
public void onAddFriend(FriendEvent.Add event) { public void onAddFriend(FriendEvent.Add event) {
if (isApplying()) return; if (isApplying()) return;
String uuid = event.getFriend().getUuid().toString(); String uuid = event.getFriend().getUuid().toString();
String name = event.getFriend().getName();
if (!friends.containsKey(uuid)) { if (!friends.containsKey(uuid)) {
friends.put(uuid, name); friends.put(uuid, new FriendData(
event.getFriend().getName(),
event.getFriend().getNick(),
event.getFriend().getBefriendedAt()));
} }
ConfigManager.INSTANCE.markDirty(); ConfigManager.INSTANCE.markDirty();
} }
@@ -181,10 +164,25 @@ public class ClientConfig {
ConfigManager.INSTANCE.markDirty(); ConfigManager.INSTANCE.markDirty();
} }
@EventListener
public void onRenameFriend(FriendEvent.Rename event) {
if (isApplying()) return;
String uuid = event.getFriend().getUuid().toString();
FriendData existing = friends.get(uuid);
if (existing == null) return; // no debería pasar, pero porsiaca
friends.put(uuid, new FriendData(existing.name(), event.getFriend().getNick(), existing.befriendedAt()));
ConfigManager.INSTANCE.markDirty();
}
public record PanelData(int x, int y, boolean extended) implements Serializable { public record PanelData(int x, int y, boolean extended) implements Serializable {
@Serial private static final long serialVersionUID = 1L; @Serial private static final long serialVersionUID = 1L;
} }
public record FriendData(String name, String nick, long befriendedAt) implements Serializable {
@Serial private static final long serialVersionUID = 1L;
}
public record MacroData(String name, int key, List<String> lines) implements Serializable { public record MacroData(String name, int key, List<String> lines) implements Serializable {
@Serial private static final long serialVersionUID = 1L; @Serial private static final long serialVersionUID = 1L;
} }
@@ -16,12 +16,10 @@ import me.retucio.sputnik.ui.hud.HudElement;
import me.retucio.sputnik.ui.hud.HudRenderer; import me.retucio.sputnik.ui.hud.HudRenderer;
import me.retucio.sputnik.ui.widgets.Panel; import me.retucio.sputnik.ui.widgets.Panel;
import me.retucio.sputnik.ui.widgets.panels.ExtendablePanel; import me.retucio.sputnik.ui.widgets.panels.ExtendablePanel;
import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
import me.retucio.sputnik.ui.widgets.panels.ModulePanel; import me.retucio.sputnik.ui.widgets.panels.ModulePanel;
import me.retucio.sputnik.ui.screen.ClickGui; import me.retucio.sputnik.ui.screen.ClickGui;
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
import me.retucio.sputnik.ui.widgets.panels.SettingsPanel; import me.retucio.sputnik.ui.widgets.panels.SettingsPanel;
import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
@@ -316,15 +314,15 @@ public class ConfigManager {
// ------------------ APLICAR AJUSTES ------------------ // ------------------ APLICAR AJUSTES ------------------
public void applyFriends() { public void applyFriends() {
config.friends.forEach((uuid, name) -> { config.friends.forEach((uuid, data) -> {
Friend friend = new Friend(UUID.fromString(uuid)); Friend friend = new Friend(UUID.fromString(uuid), data.befriendedAt());
friend.setName(name); friend.setName(data.name());
friend.setNick(data.nick());
FriendManager.INSTANCE.add(friend); FriendManager.INSTANCE.add(friend);
}); });
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.friends", Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.friends",
"amigos aplicados")); "amigos aplicados"));
} }
public void applyMacros() { public void applyMacros() {
MacroManager.INSTANCE.setMacros(config.macros.stream() MacroManager.INSTANCE.setMacros(config.macros.stream()
.map(data -> new Macro(data.name(), data.key(), data.lines())) .map(data -> new Macro(data.name(), data.key(), data.lines()))
@@ -362,6 +360,7 @@ public class ConfigManager {
case ListSetting listSetting -> applyListSetting(listSetting, value); case ListSetting listSetting -> applyListSetting(listSetting, value);
case ColorSetting colorSetting -> applyColorSetting(colorSetting, value); case ColorSetting colorSetting -> applyColorSetting(colorSetting, value);
case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value); case OptionSetting optionSetting -> applyOptionSetting(optionSetting, value);
case FileSetting fileSetting -> applyFileSetting(fileSetting, value);
default -> Sputnik.LOGGER.warn(I18nUtil.fmt("sputnik.config.warn.unknownsetting", default -> Sputnik.LOGGER.warn(I18nUtil.fmt("sputnik.config.warn.unknownsetting",
"watafac queseso: %s", setting.getClass().getSimpleName())); "watafac queseso: %s", setting.getClass().getSimpleName()));
} }
@@ -423,7 +422,6 @@ public class ConfigManager {
applyExtendablePanel(panel); applyExtendablePanel(panel);
} }
applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel()); applyExtendablePanel(ClickGui.INSTANCE.getClientSettingsPanel());
applyExtendablePanel(ClickGui.INSTANCE.getFriendsPanel());
Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.extendablepanels", Sputnik.LOGGER.info(I18nUtil.fmt("sputnik.config.info.extendablepanels",
"posiciones de marcos extendibles aplicadas")); "posiciones de marcos extendibles aplicadas"));
@@ -439,9 +437,6 @@ public class ConfigManager {
if (panel instanceof ClientSettingsPanel) { if (panel instanceof ClientSettingsPanel) {
panelData = config.extendablePanels.get("ajustes"); panelData = config.extendablePanels.get("ajustes");
} }
if (panel instanceof FriendsPanel) {
panelData = config.extendablePanels.get("amigos");
}
if (panelData != null) { if (panelData != null) {
panel.setX(panelData.x()); panel.setX(panelData.x());
@@ -477,8 +472,8 @@ public class ConfigManager {
} }
private static void applyStringSetting(StringSetting setting, Object value) { private static void applyStringSetting(StringSetting setting, Object value) {
if (value instanceof String) { if (value instanceof String v) {
setting.setValue((String) value); setting.setValue(v);
} }
} }
@@ -539,6 +534,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) { private static <T> void applyOptionalProperty(Map<?, ?> map, String key, Class<T> type, Consumer<T> setter) {
Object value = map.get(key); Object value = map.get(key);
if (type.isInstance(value)) { if (type.isInstance(value)) {
@@ -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;
}
}
@@ -3,7 +3,8 @@ package me.retucio.sputnik.event.sputnik;
import com.github.retucio.neutrino.Event; import com.github.retucio.neutrino.Event;
import me.retucio.sputnik.friend.Friend; import me.retucio.sputnik.friend.Friend;
// evento lanzado cuando se agrega o se elimina un amigo
// evento lanzado cuando se agrega, elimina o renombra un amigo
public class FriendEvent extends Event { public class FriendEvent extends Event {
private final Friend friend; private final Friend friend;
@@ -23,4 +24,8 @@ public class FriendEvent extends Event {
public static class Remove extends FriendEvent { public static class Remove extends FriendEvent {
public Remove(Friend friend) { super(friend); } public Remove(Friend friend) { super(friend); }
} }
}
public static class Rename extends FriendEvent {
public Rename(Friend friend) { super(friend); }
}
}
@@ -1,9 +0,0 @@
package me.retucio.sputnik.event.sputnik;
import com.github.retucio.neutrino.Event;
public class FriendPanelEvent {
public static class Extend extends Event {} // al extenderlo / contraerlo
public static class Move extends Event {} // al cambiarlo de posición
}
@@ -1,6 +1,7 @@
package me.retucio.sputnik.friend; package me.retucio.sputnik.friend;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.PlayerInfo;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -13,12 +14,20 @@ public class Friend {
private static final Minecraft mc = Minecraft.getInstance(); private static final Minecraft mc = Minecraft.getInstance();
private String name; private String name;
private String nick;
private final UUID uuid; private final UUID uuid;
private final long befriendedAt;
private boolean searchMatch; private boolean searchMatch;
public Friend(UUID uuid) { public Friend(UUID uuid) {
this.uuid = uuid; this.uuid = uuid;
this.befriendedAt = System.currentTimeMillis();
}
public Friend(UUID uuid, long befriendedAt) {
this.uuid = uuid;
this.befriendedAt = befriendedAt;
} }
public String getName() { public String getName() {
@@ -29,10 +38,27 @@ public class Friend {
this.name = name; this.name = name;
} }
public String getNick() {
return nick;
}
public void setNick(String nick) {
this.nick = nick;
}
// apodo si existe, si no el nombre real
public String getDisplayName() {
return (nick == null || nick.isBlank()) ? name : nick;
}
public UUID getUuid() { public UUID getUuid() {
return uuid; return uuid;
} }
public long getBefriendedAt() {
return befriendedAt;
}
public @Nullable Player getPlayer() { public @Nullable Player getPlayer() {
if (mc.level == null) return null; if (mc.level == null) return null;
Entity entity = mc.level.getEntity(uuid); Entity entity = mc.level.getEntity(uuid);
@@ -40,6 +66,11 @@ public class Friend {
return player; return player;
} }
public @Nullable PlayerInfo getPlayerInfo() {
if (mc.getConnection() == null) return null;
return mc.getConnection().getPlayerInfo(uuid);
}
public boolean isSearchMatch() { public boolean isSearchMatch() {
return searchMatch; return searchMatch;
} }
@@ -56,4 +87,4 @@ public class Friend {
NOT_BEFRIENDED, NOT_BEFRIENDED,
NO_FRIENDS; // :( NO_FRIENDS; // :(
} }
} }
@@ -29,6 +29,7 @@ public class FriendManager {
public void add(UUID uuid) { public void add(UUID uuid) {
Friend friend = new Friend(uuid); Friend friend = new Friend(uuid);
friend.setName(friend.getPlayer().getName().getString()); friend.setName(friend.getPlayer().getName().getString());
friend.setNick(friend.getName());
add(friend); add(friend);
} }
@@ -61,6 +62,11 @@ public class FriendManager {
return Friend.Status.SUCCESS; return Friend.Status.SUCCESS;
} }
public void rename(Friend friend, String nick) {
friend.setNick(nick);
Sputnik.EVENT_BUS.post(new FriendEvent.Rename(friend));
}
public Friend get(UUID uuid) { public Friend get(UUID uuid) {
for (Friend friend : friends) { for (Friend friend : friends) {
if (friend.getUuid().equals(uuid)) { if (friend.getUuid().equals(uuid)) {
@@ -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.BoatFly;
import me.retucio.sputnik.module.modules.movement.Velocity; import me.retucio.sputnik.module.modules.movement.Velocity;
import me.retucio.sputnik.module.modules.render.Nametags; import me.retucio.sputnik.module.modules.render.Nametags;
import me.retucio.sputnik.util.interfaces.IVec3;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType; 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.projectile.arrow.AbstractArrow;
import net.minecraft.world.entity.vehicle.boat.AbstractBoat; import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
import net.minecraft.world.phys.HitResult; 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.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
@@ -8,8 +8,10 @@ import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -31,7 +33,7 @@ public abstract class EntityRendererMixin {
@ModifyExpressionValue(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;getTeamColor()I")) @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) { 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; return original;
} }
} }
@@ -5,10 +5,10 @@ import me.retucio.sputnik.event.network.ReceiveMessageEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.misc.ChatPlus; import me.retucio.sputnik.module.modules.misc.ChatPlus;
import me.retucio.sputnik.util.interfaces.IChatComponent; import me.retucio.sputnik.mixinterfaces.IChatComponent;
import me.retucio.sputnik.util.interfaces.IGuiMessage; import me.retucio.sputnik.mixinterfaces.IGuiMessage;
import me.retucio.sputnik.util.interfaces.IGuiMessageLine; import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
import me.retucio.sputnik.util.interfaces.IChatListener; import me.retucio.sputnik.mixinterfaces.IChatListener;
import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.client.gui.components.ChatComponent;
import net.minecraft.client.multiplayer.chat.GuiMessage; import net.minecraft.client.multiplayer.chat.GuiMessage;
@@ -1,7 +1,7 @@
package me.retucio.sputnik.mixin.mixins.hud; package me.retucio.sputnik.mixin.mixins.hud;
import com.mojang.authlib.GameProfile; 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.client.multiplayer.chat.GuiMessage;
import net.minecraft.util.FormattedCharSequence; import net.minecraft.util.FormattedCharSequence;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@@ -1,7 +1,7 @@
package me.retucio.sputnik.mixin.mixins.hud; package me.retucio.sputnik.mixin.mixins.hud;
import com.mojang.authlib.GameProfile; 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.client.multiplayer.chat.GuiMessage;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
@@ -84,7 +84,7 @@ public abstract class HudMixin {
// dangerous abbreviation // dangerous abbreviation
CrosshairPlus cp = ModuleManager.INSTANCE.getModuleByClass(CrosshairPlus.class); 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 w = cp.isEnabled() ? cp.width.getIntValue() : width;
int h = cp.isEnabled() ? cp.height.getIntValue() : height; 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 com.llamalad7.mixinextras.sugar.Local;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.event.network.JoinWorldEvent; 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.ShutdownEvent;
import me.retucio.sputnik.event.TickEvent; import me.retucio.sputnik.event.TickEvent;
import me.retucio.sputnik.event.interact.UseItemEvent; import me.retucio.sputnik.event.interact.UseItemEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Freecam; import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.modules.player.FastUse; 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.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
@@ -0,0 +1,33 @@
package me.retucio.sputnik.mixin.mixins.misc;
import me.retucio.sputnik.util.Lists;
import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponentMap;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.Item;
import org.jspecify.annotations.Nullable;
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(Holder.Reference.class)
public abstract class ReferenceMixin<T> {
@Shadow
private @Nullable DataComponentMap components;
@Shadow
private @Nullable T value;
@Inject(method = "bindComponents", at = @At("TAIL"))
private void onBindComponents(DataComponentMap components, CallbackInfo ci) {
if (this.components == null || !this.components.has(DataComponents.FOOD)) return;
if (!(this.value instanceof Item item)) return;
Lists.foodList.add(item);
Lists.foodNames.put(item, BuiltInRegistries.ITEM.getKey(item).toLanguageKey());
}
}
@@ -1,6 +1,6 @@
package me.retucio.sputnik.mixin.mixins.misc; 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 net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@@ -1,7 +1,7 @@
package me.retucio.sputnik.mixin.mixins.network; package me.retucio.sputnik.mixin.mixins.network;
import com.mojang.authlib.GameProfile; 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.client.multiplayer.chat.ChatListener;
import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
@@ -4,7 +4,7 @@ import me.retucio.sputnik.mixin.accessors.PackConfirmScreenAccessor;
import me.retucio.sputnik.mixin.accessors.PendingRequestAccessor; import me.retucio.sputnik.mixin.accessors.PendingRequestAccessor;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.network.RPackBypass; 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.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl; 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));
}
}
@@ -15,7 +15,7 @@ public abstract class EntityHitboxDebugRendererMixin {
@ModifyVariable(method = "showHitboxes", at = @At("STORE"), name = "mainColor") @ModifyVariable(method = "showHitboxes", at = @At("STORE"), name = "mainColor")
private int modifyHitboxColor(int original) { private int modifyHitboxColor(int original) {
Hitboxes hitboxes = ModuleManager.INSTANCE.getModuleByClass(Hitboxes.class); Hitboxes hitboxes = ModuleManager.INSTANCE.getModuleByClass(Hitboxes.class);
if (hitboxes.isEnabled()) return hitboxes.color.getRGB(); if (hitboxes.isEnabled()) return hitboxes.color.getRgb();
return original; 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;
}
}
@@ -10,16 +10,25 @@ import me.retucio.sputnik.event.render.Render3DEvent;
import me.retucio.sputnik.event.render.RenderBlockOutlineEvent; import me.retucio.sputnik.event.render.RenderBlockOutlineEvent;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Freecam; import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.modules.render.BreakingProgress;
import me.retucio.sputnik.util.render.SputnikBuffers; import me.retucio.sputnik.util.render.SputnikBuffers;
import net.minecraft.client.DeltaTracker; import net.minecraft.client.DeltaTracker;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.ShaderManager;
import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.state.level.CameraRenderState; import net.minecraft.client.renderer.state.level.CameraRenderState;
import net.minecraft.client.renderer.state.level.LevelRenderState; import net.minecraft.client.renderer.state.level.LevelRenderState;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.model.ModelManager;
import net.minecraft.client.resources.model.sprite.AtlasManager;
import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.util.profiling.ProfilerFiller;
import org.joml.Matrix4fc; import org.joml.Matrix4fc;
import org.joml.Vector4f; import org.joml.Vector4f;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.*; import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.invoke.arg.Args; import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@@ -31,6 +40,14 @@ import static me.retucio.sputnik.Sputnik.mc;
@Mixin(LevelRenderer.class) @Mixin(LevelRenderer.class)
public abstract class LevelRendererMixin { public abstract class LevelRendererMixin {
@Unique
private BreakingProgress bp;
@Inject(method = "<init>", at = @At("TAIL"))
private void getModules(EntityRenderDispatcher entityRenderDispatcher, BlockEntityRenderDispatcher blockEntityRenderDispatcher, ModelManager modelManager, TextureManager textureManager, AtlasManager atlasManager, ShaderManager shaderManager, GameRenderer gameRenderer, int width, int height, CallbackInfo ci) {
bp = ModuleManager.INSTANCE.getModuleByClass(BreakingProgress.class);
}
@Inject(method = "render", at = @At("RETURN")) @Inject(method = "render", at = @At("RETURN"))
private void render(GraphicsResourceAllocator resourceAllocator, DeltaTracker dt, boolean renderOutline, CameraRenderState cameraState, Matrix4fc modelViewMatrix, GpuBufferSlice terrainFog, Vector4f fogColor, boolean shouldRenderSky, CallbackInfo ci, @Local(name = "profiler") ProfilerFiller profiler) { private void render(GraphicsResourceAllocator resourceAllocator, DeltaTracker dt, boolean renderOutline, CameraRenderState cameraState, Matrix4fc modelViewMatrix, GpuBufferSlice terrainFog, Vector4f fogColor, boolean shouldRenderSky, CallbackInfo ci, @Local(name = "profiler") ProfilerFiller profiler) {
if (mc == null || mc.level == null) return; if (mc == null || mc.level == null) return;
@@ -55,13 +72,6 @@ public abstract class LevelRendererMixin {
if (freecam.isEnabled() && !freecam.blockOutlines.getValue()) ci.cancel(); if (freecam.isEnabled() && !freecam.blockOutlines.getValue()) ci.cancel();
} }
// @Inject(method = "hasBlindnessOrDarkness(Lnet/minecraft/client/extractRenderState/Camera;)Z", at = @At("HEAD"), cancellable = true)
// private void hasBlindnessOrDarkness(Camera camera, CallbackInfoReturnable<Boolean> cir) {
// NoRender noRender = ModuleManager.INSTANCE.getModuleByClass(NoRender.class);
// if (!noRender.isEnabled()) return;
// if (!noRender.blindnessEffect.getValue() || !noRender.darknessEffect.getValue()) cir.setReturnValue(null);
// }
// puto mojang con sus nombres confusos // puto mojang con sus nombres confusos
@ModifyArgs(method = "submitBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;submitHitOutline(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/state/level/BlockOutlineRenderState;IFZ)V")) @ModifyArgs(method = "submitBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;submitHitOutline(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/state/level/BlockOutlineRenderState;IFZ)V"))
private void modifyBlockOutline(Args args) { private void modifyBlockOutline(Args args) {
@@ -72,4 +82,12 @@ public abstract class LevelRendererMixin {
if (event.getLineWidth() != (float) args.get(5)) if (event.getLineWidth() != (float) args.get(5))
args.set(5, event.getLineWidth()); args.set(5, event.getLineWidth());
} }
@Inject(method = "submitBlockDestroyAnimation", at = @At("HEAD"), cancellable = true)
private void cancelBreakingAnim(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, LevelRenderState levelRenderState, CallbackInfo ci) {
if (!bp.isEnabled()) return;
if (bp.cancelAnim.getValue()) {
ci.cancel();
}
}
} }
@@ -8,7 +8,6 @@ import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.modules.render.Nametags; import me.retucio.sputnik.module.modules.render.Nametags;
import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EntityTypes; import net.minecraft.world.entity.EntityTypes;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
@@ -16,6 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -49,19 +49,27 @@ public abstract class LivingEntityRendererMixin<T extends LivingEntity> {
} }
@ModifyReturnValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN")) @ModifyReturnValue(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"))
private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true) T livingEntity) { private boolean shouldRenderPlayerNametag(boolean original, @Local(argsOnly = true, name = "entity") T entity) {
if (nametags.isEnabled() && livingEntity instanceof Player) if (nametags.isEnabled() && entity instanceof Player)
return nametags.entities.isEnabled(EntityTypes.PLAYER) && original; return nametags.entities.isEnabled(EntityTypes.PLAYER) && original;
return original; return original;
} }
@Inject(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"), cancellable = true) @Inject(method = "shouldShowName(Lnet/minecraft/world/entity/LivingEntity;D)Z", at = @At("RETURN"), cancellable = true)
private void renderSelfNametag(T livingEntity, double d, CallbackInfoReturnable<Boolean> cir) { private void renderSelfNametag(T entity, double distanceToCameraSq, CallbackInfoReturnable<Boolean> cir) {
if (livingEntity instanceof Player player) { if (entity instanceof Player player) {
if (player == mc.player && nametags.showSelf.getValue()) { if (player == mc.player && nametags.showSelf.getValue()) {
cir.setReturnValue(true); cir.setReturnValue(true);
cir.cancel(); cir.cancel();
} }
} }
} }
@ModifyArg(method = "extractNameTags(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;F)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;extractNameTags(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FDD)V"), index = 3)
private double modifyNametagRenderDistance(double original) {
if (nametags.isEnabled()) {
return nametags.distance.getValue();
}
return original;
}
} }
@@ -2,7 +2,7 @@ package me.retucio.sputnik.mixin.mixins.screen;
import me.retucio.sputnik.module.ModuleManager; import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.network.RPackBypass; 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.components.Button;
import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.layouts.LinearLayout;
@@ -33,7 +33,7 @@ public class ScreenMixin {
if (watermark == null || watermark.isEmpty()) return; if (watermark == null || watermark.isEmpty()) return;
gui.text(mc.font, watermark, gui.text(mc.font, watermark,
mc.getWindow().getGuiScaledWidth() - mc.font.width(watermark) - 2, 2, mc.getWindow().getGuiScaledWidth() - mc.font.width(watermark) - 2, 2,
ClientSettingsPanel.clientSettings.color.getRGB(), false ClientSettingsPanel.clientSettings.color.getRgb(), false
); );
} }
} }
@@ -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.client.multiplayer.chat.GuiMessage;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
@@ -1,4 +1,4 @@
package me.retucio.sputnik.util.interfaces; package me.retucio.sputnik.mixinterfaces;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
@@ -1,4 +1,4 @@
package me.retucio.sputnik.util.interfaces; package me.retucio.sputnik.mixinterfaces;
public interface IConfirmScreen { 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,4 +1,4 @@
package me.retucio.sputnik.util.interfaces; package me.retucio.sputnik.mixinterfaces;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
@@ -1,4 +1,4 @@
package me.retucio.sputnik.util.interfaces; package me.retucio.sputnik.mixinterfaces;
public interface IGuiMessageLine extends IGuiMessage { public interface IGuiMessageLine extends IGuiMessage {
@@ -1,4 +1,4 @@
package me.retucio.sputnik.util.interfaces; package me.retucio.sputnik.mixinterfaces;
import net.minecraft.core.Vec3i; import net.minecraft.core.Vec3i;
import org.joml.Vector3d; import org.joml.Vector3d;
@@ -1,6 +1,6 @@
/* code by meteorclient dev team */ /* 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.Component;
import net.minecraft.network.chat.Style; 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.event.sputnik.ToggleModuleEvent;
import me.retucio.sputnik.module.setting.SettingGroup; import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; 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.EnumSetting;
import me.retucio.sputnik.module.setting.settings.KeySetting; import me.retucio.sputnik.module.setting.settings.KeySetting;
import me.retucio.sputnik.module.setting.Setting; import me.retucio.sputnik.module.setting.Setting;
import me.retucio.sputnik.ui.hud.HudRenderer; import me.retucio.sputnik.ui.hud.HudRenderer;
import me.retucio.sputnik.util.ChatUtil; import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.Colors;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import java.awt.*;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -35,8 +38,6 @@ public class Module {
// ajustes que están en todos los módulos // 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( protected KeySetting bind = new KeySetting(
"tecla", "tecla",
"tecla asignada al módulo, ESC para desactivar", "tecla asignada al módulo, ESC para desactivar",
@@ -44,7 +45,7 @@ public class Module {
).translationKey("sputnik.setting.common.bind"); ).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 // 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", "modo de tecla",
"cómo interpretar la tecla configurada", "cómo interpretar la tecla configurada",
KeyMode.class, KeyMode.TOGGLE KeyMode.class, KeyMode.TOGGLE
@@ -56,12 +57,26 @@ public class Module {
true true
).translationKey("sputnik.setting.common.notify"); ).translationKey("sputnik.setting.common.notify");
protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<NotifyMode>( protected EnumSetting<NotifyMode> notifyMode = new EnumSetting<>(
"modo de notificación", "modo de notificación",
"cómo notificar cuando se activa / desactiva", "cómo notificar cuando se activa / desactiva",
NotifyMode.class, NotifyMode.WIDGET NotifyMode.class, NotifyMode.WIDGET
).translationKey("sputnik.setting.common.notifymode"); ).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 List<SettingGroup> sgs = new ArrayList<>();
protected final SettingGroup sgModule = addSg(new SettingGroup("módulo", false, "sputnik.group.common.module")); 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")); protected final SettingGroup sgGeneral = addSg(new SettingGroup("general", true, "sputnik.group.common.general"));
@@ -72,14 +87,11 @@ public class Module {
this.name = name; this.name = name;
this.description = description; this.description = description;
this.category = category; 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) { public Module(String name, String description, Category category, int key) {
this.name = name; this(name, description, category);
this.description = description;
this.category = category;
sgModule.addAll(bind, keyMode, notify, notifyMode);
this.bind.setDefaultValue(key); this.bind.setDefaultValue(key);
// puto marcos // puto marcos
@@ -155,7 +167,6 @@ public class Module {
} }
} }
// onDisable no miraba notify.getValue(), así que avisaba aunque estuviera desactivado
private void notifyToggle(boolean on) { private void notifyToggle(boolean on) {
if (!notify.getValue()) return; if (!notify.getValue()) return;
if (ConfigManager.INSTANCE != null && ConfigManager.INSTANCE.isApplying()) return; if (ConfigManager.INSTANCE != null && ConfigManager.INSTANCE.isApplying()) return;
@@ -174,8 +185,6 @@ public class Module {
// getters y setters // getters y setters
// OJO: nombre interno. es la clave de la config. (moduleStates, getSettingKey, settingsPanels)
// y no se traduce nunca. para mostrarlo al usuario usar getDisplayName()
public String getName() { public String getName() {
return name; return name;
} }
@@ -250,6 +259,10 @@ public class Module {
return bind; return bind;
} }
public boolean isVisible() { return displayed.getValue(); }
public Color getArraylistColor() { return arraylistColor.getValue(); }
public boolean isSearchMatch() { public boolean isSearchMatch() {
return searchMatch; 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.misc.*;
import me.retucio.sputnik.module.modules.movement.*; import me.retucio.sputnik.module.modules.movement.*;
import me.retucio.sputnik.module.modules.network.*; 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.player.*;
import me.retucio.sputnik.module.modules.render.*; import me.retucio.sputnik.module.modules.render.*;
import me.retucio.sputnik.module.modules.render.CritsPlus; import me.retucio.sputnik.module.modules.render.CritsPlus;
@@ -90,6 +91,7 @@ public class ModuleManager {
add(new ChestplateSwitch()); add(new ChestplateSwitch());
add(new CrystalAura()); add(new CrystalAura());
add(new HoldAttack()); add(new HoldAttack());
add(new KillAura());
add(new MaceKill()); add(new MaceKill());
add(new ProjectileTrajectories()); add(new ProjectileTrajectories());
add(new SpearKill()); add(new SpearKill());
@@ -128,6 +130,7 @@ public class ModuleManager {
add(new Headhitters()); add(new Headhitters());
add(new HitboxDesync()); add(new HitboxDesync());
add(new InfiniteElytra()); add(new InfiniteElytra());
add(new ItemMagnet());
add(new Jesus()); add(new Jesus());
add(new Parkour()); add(new Parkour());
add(new ReverseStep()); add(new ReverseStep());
@@ -144,6 +147,7 @@ public class ModuleManager {
add(new LogoutSpots()); add(new LogoutSpots());
add(new PacketCanceller()); add(new PacketCanceller());
add(new PacketDelay()); add(new PacketDelay());
add(new PacketLogger());
add(new PacketMine()); add(new PacketMine());
add(new Reconnect()); add(new Reconnect());
add(new RPackBypass()); add(new RPackBypass());
@@ -152,6 +156,7 @@ public class ModuleManager {
private void addPlayer() { private void addPlayer() {
add(new AirPlace()); add(new AirPlace());
add(new AntiHunger()); add(new AntiHunger());
add(new AutoEat());
add(new AutoFish()); add(new AutoFish());
add(new Capes()); add(new Capes());
add(new FastUse()); add(new FastUse());
@@ -172,14 +177,17 @@ public class ModuleManager {
add(new Fonts()); add(new Fonts());
add(new GlintPlus()); add(new GlintPlus());
add(new Hitboxes()); add(new Hitboxes());
add(new ItemPhysics());
add(new Lsd()); add(new Lsd());
add(new Nametags()); add(new Nametags());
add(new NoRender()); add(new NoRender());
add(new Particles()); add(new Particles());
add(new Stylish());
add(new Tracers()); add(new Tracers());
} }
private void addWorld() { private void addWorld() {
add(new AutoMine());
add(new AutoSign()); add(new AutoSign());
add(new AutoTool()); add(new AutoTool());
add(new BlockInfo()); add(new BlockInfo());
@@ -358,8 +358,9 @@ public class Freecam extends Module {
if (mc.player == null) return; // el jugador probablemente nunca sea nulo bajo estas circunstancias pero quién sabe if (mc.player == null) return; // el jugador probablemente nunca sea nulo bajo estas circunstancias pero quién sabe
if (event.getPacket() instanceof ClientboundPlayerCombatKillPacket packet) { if (event.getPacket() instanceof ClientboundPlayerCombatKillPacket packet) {
if (mc.player.getId() == packet.playerId()) if (mc.player.getId() == packet.playerId()) {
toggle(); toggle();
}
} else if (event.getPacket() instanceof ClientboundSetHealthPacket packet) { } else if (event.getPacket() instanceof ClientboundSetHealthPacket packet) {
if (mc.player.getHealth() - packet.getHealth() > 0 && toggleOnDamage.getValue()) { if (mc.player.getHealth() - packet.getHealth() > 0 && toggleOnDamage.getValue()) {
ChatUtil.info(Component.translatable("sputnik.module.freecam.damagedisable")); ChatUtil.info(Component.translatable("sputnik.module.freecam.damagedisable"));
@@ -7,6 +7,7 @@ import me.retucio.sputnik.module.setting.settings.*;
import me.retucio.sputnik.ui.hud.HudElement; import me.retucio.sputnik.ui.hud.HudElement;
import me.retucio.sputnik.ui.hud.HudRenderer; import me.retucio.sputnik.ui.hud.HudRenderer;
import me.retucio.sputnik.ui.hud.HudEditorScreen; import me.retucio.sputnik.ui.hud.HudEditorScreen;
import me.retucio.sputnik.ui.hud.elements.CustomImageElement;
import me.retucio.sputnik.ui.hud.elements.DynoElement; import me.retucio.sputnik.ui.hud.elements.DynoElement;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
@@ -126,6 +127,19 @@ public class Hud extends Module {
Dynosaurs.class, Dynosaurs.SPINOSAURUS 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() { public Hud() {
super("HUD", super("HUD",
"superposición de la pantalla con info. adicional", "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); DynoElement element = (DynoElement) HudRenderer.INSTANCE.getElement(DynoElement.class);
if (element != null) element.reloadTexture(); if (element != null) element.reloadTexture();
}); });
customImagePath.onUpdate(v -> {
CustomImageElement element = (CustomImageElement) HudRenderer.INSTANCE.getElement(CustomImageElement.class);
if (element != null) element.reloadTexture();
});
} }
public enum TimeFormat { public enum TimeFormat {
@@ -171,4 +190,21 @@ public class Hud extends Module {
@Override public String toString() { return name; } @Override public String toString() { return name; }
public String toRealString() { return super.toString(); } 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; }
}
} }
@@ -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; }
}
}
@@ -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.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting; import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.ChatUtil; import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.interfaces.IGuiMessage; import me.retucio.sputnik.mixinterfaces.IGuiMessage;
import me.retucio.sputnik.util.interfaces.IGuiMessageLine; import me.retucio.sputnik.mixinterfaces.IGuiMessageLine;
import me.retucio.sputnik.util.interfaces.TextVisitor; import me.retucio.sputnik.mixinterfaces.TextVisitor;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.components.PlayerFaceExtractor; import net.minecraft.client.gui.components.PlayerFaceExtractor;
@@ -34,8 +34,10 @@ public class ScreenshotPlus extends Module {
private final SettingGroup sgButtons = addSg(new SettingGroup("botones", true)); private final SettingGroup sgButtons = addSg(new SettingGroup("botones", true));
public final EnumSetting<ScreenshotActions> defaultAction = sgGeneral.add(new EnumSetting<>("por defecto", "qué acción tomar por defecto", public final EnumSetting<ScreenshotActions> defaultAction = sgGeneral.add(new EnumSetting<>(
ScreenshotActions.class, ScreenshotActions.NONE)); "por defecto", "qué acción tomar por defecto",
ScreenshotActions.class, ScreenshotActions.NONE)
);
private final BooleanSetting saveButton = sgButtons.add(new BooleanSetting("botón de guardar", "mostrar botón para guardar la captura localmente", true)); private final BooleanSetting saveButton = sgButtons.add(new BooleanSetting("botón de guardar", "mostrar botón para guardar la captura localmente", true));
private final BooleanSetting copyButton = sgButtons.add(new BooleanSetting("botón de copiar", "mostrar botón para copiar la captura al portapapeles", true)); private final BooleanSetting copyButton = sgButtons.add(new BooleanSetting("botón de copiar", "mostrar botón para copiar la captura al portapapeles", true));
@@ -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 0.1
)).visibility(extend::getValue); )).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 */ /* torre */
@@ -160,7 +169,7 @@ public class Scaffold extends Module {
private final ColorSetting fillingColor = sgRender.add(new ColorSetting( private final ColorSetting fillingColor = sgRender.add(new ColorSetting(
"color del relleno", "color del relleno",
"color a uisar al renderizar el relleno", "color a usar al renderizar el relleno",
Colors.withAlpha(Colors.mainColor, 60), Colors.withAlpha(Colors.mainColor, 60),
false false
)).visibility(fillings::getValue); )).visibility(fillings::getValue);
@@ -228,8 +237,12 @@ public class Scaffold extends Module {
// seleccionar nivel Y // seleccionar nivel Y
double y; double y;
if (mjBridge.getValue() && mjY != null && isMoving()) { if (mjBridge.getValue()) {
y = mjY; 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 { } else {
y = pos.y - 0.5; y = pos.y - 0.5;
} }
@@ -243,7 +256,24 @@ public class Scaffold extends Module {
// colocar bloque // colocar bloque
bp.set(pos.x, y, pos.z); 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 // colocar bloque encima de la cabeza
if (headhitter.getValue() && mc.options.keyJump.isDown() && !mc.options.keyShift.isDown()) { 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 @EventListener
private void onSneak(SneakEvent event) { private void onSneak(SneakEvent event) {
// no agacharse // no agacharse
@@ -377,7 +399,7 @@ public class Scaffold extends Module {
} }
private boolean isMoving() { private boolean isMoving() {
return mc.player.zza != 0 return mc.player.zza != 0
|| mc.player.xxa != 0; || mc.player.xxa != 0;
} }
@@ -13,13 +13,13 @@ import org.jspecify.annotations.NonNull;
public class PacketCanceller extends Module { public class PacketCanceller extends Module {
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting( private final ListSetting<PacketType<? extends @NonNull Packet<?>>> c2s = sgGeneral.add(new ListSetting<>(
"cliente > servidor", "paquetes a cancelar, dirección servidor", "C2S", "paquetes a cancelar, dirección servidor",
Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames Lists.c2sPacketList, Lists.allFalse(Lists.c2sPacketList), Lists.c2sPacketNames
)); ));
private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting( private final ListSetting<PacketType<? extends @NonNull Packet<?>>> s2c = sgGeneral.add(new ListSetting<>(
"servidor > cliente", "paquetes a cancelar, dirección cliente", "S2C", "paquetes a cancelar, dirección cliente",
Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames Lists.s2cPacketList, Lists.allFalse(Lists.s2cPacketList), Lists.s2cPacketNames
)); ));
@@ -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; }
}
}
@@ -54,8 +54,6 @@ public class PacketMine extends Module {
ClickAction.ADD_PRIORITY ClickAction.ADD_PRIORITY
)); ));
// el espacio del final es a propósito: compartía clave de config. con retryTime ("delay"),
// así que se pisaban el valor. se muestra igual porque getName() hace strip()
private final NumberSetting selectionDelay = sgGeneral.add(new NumberSetting( private final NumberSetting selectionDelay = sgGeneral.add(new NumberSetting(
"delay ", "delay ",
"delay entre selecciones de bloques", "delay entre selecciones de bloques",
@@ -0,0 +1,123 @@
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.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.ListSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.Lists;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.Consumable;
import net.minecraft.world.item.consume_effects.ApplyStatusEffectsConsumeEffect;
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 final NumberSetting whenToStop = sgGeneral.add(new NumberSetting(
"cuándo parar", "cuántos puntos de comida hace falta tener para parar de comer",
20, 1, 20, 1
));
private final ListSetting<Item> blacklist = sgGeneral.add(new ListSetting<>(
"lista negra", "alimentos a NO comer",
() -> Lists.foodList,
() -> Lists.allFalseExcept(Lists.foodList, this::isBad),
() -> Lists.foodNames
));
private boolean eating;
public AutoEat() {
super("puto gordo", "come aut/omáticamente al tener hambre", Category.PLAYER);
}
@Override
public void onDisable() {
if (eating) stopEating();
super.onDisable();
}
@Override
public void onTick() {
if (mc.player == null) return;
if (eating) {
if (mc.player.getUseItemRemainingTicks() > 0) {
return;
} else {
if (mc.player.getFoodData().getFoodLevel() >= whenToStop.getIntValue()) {
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(
(ItemStack s) -> s.getItem().components().get(DataComponents.FOOD).nutrition()
).reversed());
if (sorted.isEmpty()) return;
sorted.removeIf(stack -> blacklist.isEnabled(stack.getItem()));
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;
break;
}
}
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);
}
private boolean isBad(Item item) {
Consumable consumable = item.components().get(DataComponents.CONSUMABLE);
if (consumable == null) return false;
return consumable.onConsumeEffects().stream()
.anyMatch(effect -> effect instanceof ApplyStatusEffectsConsumeEffect applyEffects
&& applyEffects.effects().stream().anyMatch(mobEffectInstance ->
!mobEffectInstance.getEffect().value().isBeneficial()));
}
}
@@ -39,7 +39,7 @@ public class BlockOutline extends Module {
@EventListener @EventListener
private void onRenderBlockOutline(RenderBlockOutlineEvent event) { private void onRenderBlockOutline(RenderBlockOutlineEvent event) {
event.setColor(color.getRGB()); event.setColor(color.getRgb());
event.setLineWidth(lineWidth.getFloatValue()); event.setLineWidth(lineWidth.getFloatValue());
} }
} }
@@ -20,16 +20,22 @@ import java.awt.*;
public class BreakingProgress extends Module { public class BreakingProgress extends Module {
private final SettingGroup sgOulines = addSg(new SettingGroup("contorno", true)); private final SettingGroup sgOutlines = addSg(new SettingGroup("contorno", true));
private final SettingGroup sgFilling = addSg(new SettingGroup("relleno", true)); private final SettingGroup sgFilling = addSg(new SettingGroup("relleno", true));
private final EnumSetting<BreakMode> breakMode = sgGeneral.add(new EnumSetting<>("modo de minado", "elige si el cubo se encoge o se dilata", private final EnumSetting<BreakMode> breakMode = sgGeneral.add(new EnumSetting<>("modo de minado", "elige si el cubo se encoge o se dilata",
BreakMode.class, BreakMode.INWARDS)); BreakMode.class, BreakMode.INWARDS));
private final BooleanSetting outlines = sgOulines.add(new BooleanSetting("contorno", "renderizar contorno", true)); public final BooleanSetting cancelAnim = sgGeneral.add(new BooleanSetting(
private final ColorSetting outlineColor = sgOulines.add(new ColorSetting("color del contorno", "color del contorno", "cancelar animación",
"no renderizar la anim. original",
true
));
private final BooleanSetting outlines = sgOutlines.add(new BooleanSetting("contorno", "renderizar contorno", true));
private final ColorSetting outlineColor = sgOutlines.add(new ColorSetting("color del contorno", "color del contorno",
new Color(0, 255, 0, 200), false)); new Color(0, 255, 0, 200), false));
private final NumberSetting lineWidth = sgOulines.add(new NumberSetting("grosor de línea", "grosor de las líneas del contorno", 1, 1, 5, 0.1)); private final NumberSetting lineWidth = sgOutlines.add(new NumberSetting("grosor de línea", "grosor de las líneas del contorno", 1, 1, 5, 0.1));
private final BooleanSetting fillings = sgFilling.add(new BooleanSetting("relleno", "renderizar relleno", true)); private final BooleanSetting fillings = sgFilling.add(new BooleanSetting("relleno", "renderizar relleno", true));
private final ColorSetting fillingColor = sgFilling.add(new ColorSetting("color del relleno", "color del relleno", private final ColorSetting fillingColor = sgFilling.add(new ColorSetting("color del relleno", "color del relleno",
@@ -46,30 +46,30 @@ public class GlintPlus extends Module {
} }
public RenderType getGlint() { public RenderType getGlint() {
int color = getColor(); int color = getGlintColor();
if (!isEnabled() || !items.getValue()) return RenderTypes.glint(); if (!isEnabled() || !items.getValue()) return RenderTypes.glint();
return GlintRenderType.glintColor.get(color); return GlintRenderType.glintColor.get(color);
} }
public RenderType getGlintTranslucent() { public RenderType getGlintTranslucent() {
int color = getColor(); int color = getGlintColor();
if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent(); if (!isEnabled() || !items.getValue()) return RenderTypes.glintTranslucent();
return GlintRenderType.glintTranslucentColor.get(color); return GlintRenderType.glintTranslucentColor.get(color);
} }
public RenderType getEntityGlint() { public RenderType getEntityGlint() {
int color = getColor(); int color = getGlintColor();
if (!isEnabled() || !items.getValue()) return RenderTypes.entityGlint(); if (!isEnabled() || !items.getValue()) return RenderTypes.entityGlint();
return GlintRenderType.entityGlintColor.get(color); return GlintRenderType.entityGlintColor.get(color);
} }
public RenderType getArmorEntityGlint() { public RenderType getArmorEntityGlint() {
int color = getColor(); int color = getGlintColor();
if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint(); if (!isEnabled() || !armor.getValue()) return RenderTypes.armorEntityGlint();
return GlintRenderType.armorEntityGlintColor.get(color); return GlintRenderType.armorEntityGlintColor.get(color);
} }
public int getColor() { public int getGlintColor() {
String colorName = glintColor.getValue().getRealName().toLowerCase(); String colorName = glintColor.getValue().getRealName().toLowerCase();
switch (colorName) { 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) {}
}
@@ -3,6 +3,7 @@ package me.retucio.sputnik.module.modules.render;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.config.ConfigManager;
import me.retucio.sputnik.mixin.mixins.entity.EntityMixin; import me.retucio.sputnik.mixin.mixins.entity.EntityMixin;
import me.retucio.sputnik.mixin.mixins.entity.ItemEntityMixin; import me.retucio.sputnik.mixin.mixins.entity.ItemEntityMixin;
import me.retucio.sputnik.mixin.mixins.player.PlayerMixin; import me.retucio.sputnik.mixin.mixins.player.PlayerMixin;
@@ -13,6 +14,7 @@ import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.EnumSetting; import me.retucio.sputnik.module.setting.settings.EnumSetting;
import me.retucio.sputnik.module.setting.settings.ListSetting; import me.retucio.sputnik.module.setting.settings.ListSetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.Lists; import me.retucio.sputnik.util.Lists;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
@@ -64,6 +66,7 @@ public class Nametags extends Module {
public final BooleanSetting alwaysVisible = sgGeneral.add(new BooleanSetting("siempre mostrar nametags", "mostrar nametag cuando el jugador está agachado o es invisible", false)); public final BooleanSetting alwaysVisible = sgGeneral.add(new BooleanSetting("siempre mostrar nametags", "mostrar nametag cuando el jugador está agachado o es invisible", false));
public final BooleanSetting showSelf = sgGeneral.add(new BooleanSetting("mostrar propio", "mostrar nametag propio", false)); public final BooleanSetting showSelf = sgGeneral.add(new BooleanSetting("mostrar propio", "mostrar nametag propio", false));
public final BooleanSetting friendNick = sgGeneral.add(new BooleanSetting("motes", "usar los motes de amigos", true)); public final BooleanSetting friendNick = sgGeneral.add(new BooleanSetting("motes", "usar los motes de amigos", true));
public final NumberSetting distance = sgGeneral.add(new NumberSetting("distancia", "distancia máxima para renderizar nametags", 1024, 1, 1024, 1));
public final BooleanSetting countItems = sgInfo.add(new BooleanSetting("contar items", "muestra cuánto de un item hay en un stack dropeado", true)); public final BooleanSetting countItems = sgInfo.add(new BooleanSetting("contar items", "muestra cuánto de un item hay en un stack dropeado", true));
public final BooleanSetting showProjectileDamage = sgInfo.add(new BooleanSetting("daño del proyectil", "muestra cuánto daño hace un proyectil en su nametag", true)); public final BooleanSetting showProjectileDamage = sgInfo.add(new BooleanSetting("daño del proyectil", "muestra cuánto daño hace un proyectil en su nametag", true));
@@ -88,7 +91,7 @@ public class Nametags extends Module {
defaultEntities.replace(EntityTypes.TNT, true); defaultEntities.replace(EntityTypes.TNT, true);
entities.setDefaultValue(defaultEntities); entities.setDefaultValue(defaultEntities);
health.onUpdate(v -> healthMode.visibility(v)); health.onUpdate(healthMode::visibility);
entities.onUpdate(entities -> { entities.onUpdate(entities -> {
items.visibility(entities.get(EntityTypes.ITEM)); items.visibility(entities.get(EntityTypes.ITEM));
@@ -129,7 +132,7 @@ public class Nametags extends Module {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
public String getOwnerName(EntityReference<LivingEntity> owner) { public String getOwnerName(EntityReference<LivingEntity> owner) {
// si el dueño está en línea (de manera segura) // si el dueño está en línea (de manera segura)
if (mc.level instanceof UniquelyIdentifyable queriableWorld) { // UUIDLookup<?> ?? if (mc.level instanceof UniquelyIdentifyable queriableWorld) {
LivingEntity ownerEntity = owner.resolve(queriableWorld, LivingEntity.class); LivingEntity ownerEntity = owner.resolve(queriableWorld, LivingEntity.class);
if (ownerEntity instanceof Player playerEntity) return playerEntity.getName().getString(); if (ownerEntity instanceof Player playerEntity) return playerEntity.getName().getString();
} }
@@ -0,0 +1,255 @@
package me.retucio.sputnik.module.modules.render;
import com.github.retucio.neutrino.EventListener;
import com.mojang.blaze3d.vertex.PoseStack;
import me.retucio.sputnik.event.input.KeyEvent;
import me.retucio.sputnik.event.render.RenderHeldItemEvent;
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.KeySetting;
import me.retucio.sputnik.module.setting.settings.NumberSetting;
import net.minecraft.world.InteractionHand;
import org.joml.Quaternionf;
import org.lwjgl.glfw.GLFW;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class Stylish extends Module {
private final KeySetting key = sgGeneral.add(new KeySetting(
"tecla", "tecla a pulsar para hacer el truco",
GLFW.GLFW_KEY_Y
));
private final EnumSetting<TrickType> trick = sgGeneral.add(new EnumSetting<>(
"truco", "qué truco hacer al pulsar la tecla",
TrickType.class, TrickType.SPIN
));
private final BooleanSetting comboMode = sgGeneral.add(new BooleanSetting(
"combo", "encadena varios trucos distintos en una sola pulsación",
false
));
private final NumberSetting comboLength = sgGeneral.add(new NumberSetting(
"trucos por combo", "cuántos trucos encadenar si el combo está activado",
3, 2, 6, 1
)).visibility(comboMode::getValue);
private final NumberSetting speed = sgGeneral.add(new NumberSetting(
"velocidad", "velocidad de giro (grados/seg)",
360, 30, 2000, 1
));
private final NumberSetting spins = sgGeneral.add(new NumberSetting(
"vueltas", "cuantas vueltas completas da por truco",
1, 1, 5, 1
));
private final EnumSetting<RotateDirection> dir = sgGeneral.add(new EnumSetting<>(
"dirección", "dirección a rotar el ítem",
RotateDirection.class, RotateDirection.COUNTER_CLOCKWISE
));
private final EnumSetting<Hand> hand = sgGeneral.add(new EnumSetting<>(
"mano", "en qué mano(s) hacerlo",
Hand.class, Hand.MAIN_HAND
));
private final BooleanSetting easing = sgGeneral.add(new BooleanSetting(
"suavizado", "usa una curva de aceleración/desaceleración en vez de velocidad lineal",
true
));
private final NumberSetting cooldown = sgGeneral.add(new NumberSetting(
"cooldown", "tiempo mínimo en ms entre activaciones",
150, 0, 2000, 10
));
// estado de anim.
private boolean spinning = false;
private float progressDegrees = 0f;
private long lastTimeNanos = 0L;
private long lastTriggerMillis = 0L;
private final List<TrickType> queue = new ArrayList<>();
private int queueIndex = 0;
private final Random random = new Random();
public Stylish() {
super("estiloso", "haz truquitos con items en las manos", Category.RENDER);
}
@EventListener
private void onKey(KeyEvent event) {
if (event.getKey() != key.getValue()) return;
if (event.getAction() != GLFW.GLFW_PRESS) return;
if (spinning) return;
long now = System.currentTimeMillis();
if (now - lastTriggerMillis < cooldown.getIntValue()) return;
lastTriggerMillis = now;
buildQueue();
startNextTrick();
}
private void buildQueue() {
queue.clear();
queueIndex = 0;
if (!comboMode.getValue()) {
queue.add(resolveTrick(trick.getValue()));
return;
}
int amount = comboLength.getIntValue();
for (int i = 0; i < amount; i++) {
queue.add(resolveTrick(TrickType.RANDOM));
}
}
private TrickType resolveTrick(TrickType requested) {
if (requested != TrickType.RANDOM) return requested;
TrickType[] real = {
TrickType.SPIN, TrickType.FLIP, TrickType.ROLL,
TrickType.TWIRL, TrickType.WAVE, TrickType.POP, TrickType.THROW_CATCH
};
return real[random.nextInt(real.length)];
}
private void startNextTrick() {
if (queueIndex >= queue.size()) {
spinning = false;
return;
}
spinning = true;
progressDegrees = 0f;
lastTimeNanos = System.nanoTime();
}
@EventListener
private void onRenderHeldItem(RenderHeldItemEvent event) {
if (!spinning) return;
if ((event.getHand() == InteractionHand.MAIN_HAND && hand.is(Hand.OFF_HAND))
|| (event.getHand() == InteractionHand.OFF_HAND && hand.is(Hand.MAIN_HAND))
) {
return;
}
PoseStack matrices = event.getMatrices();
long now = System.nanoTime();
float delta = (now - lastTimeNanos) / 1_000_000_000f;
lastTimeNanos = now;
float target = 360.0f * spins.getIntValue();
progressDegrees += speed.getFloatValue() * delta;
boolean finished = progressDegrees >= target;
if (finished) progressDegrees = target;
float rawFraction = progressDegrees / target; // 0..1
float fraction = easing.getValue() ? easeInOutCubic(rawFraction) : rawFraction;
TrickType current = queue.get(queueIndex);
applyTrick(current, matrices, fraction);
if (finished) {
queueIndex++;
if (queueIndex < queue.size()) {
startNextTrick();
} else {
spinning = false;
}
}
}
private void applyTrick(TrickType type, PoseStack matrices, float fraction) {
float directionSign = dir.getValue() == RotateDirection.CLOCKWISE ? -1f : 1f;
float degrees = fraction * 360.0f * spins.getIntValue();
float angleRad = (float) Math.toRadians(degrees * directionSign);
switch (type) {
case SPIN -> matrices.mulPose(new Quaternionf().rotationZ(angleRad));
case FLIP -> matrices.mulPose(new Quaternionf().rotationX(angleRad));
case ROLL -> matrices.mulPose(new Quaternionf().rotationY(angleRad));
case TWIRL -> {
// combina spin + flip para un giro más aparatoso
matrices.mulPose(new Quaternionf().rotationZ(angleRad));
matrices.mulPose(new Quaternionf().rotationX(angleRad * 0.5f));
}
case WAVE -> {
// bamboleo tipo saludo, sin vuelta completa
float waveAngle = (float) Math.sin(fraction * Math.PI * spins.getIntValue()) * 25f;
matrices.mulPose(new Quaternionf().rotationZ((float) Math.toRadians(waveAngle * directionSign)));
}
case POP -> {
// pequeño pulso de escala, como si el ítem "respirara"
float scalePulse = 1f + (float) Math.sin(fraction * Math.PI) * 0.25f;
matrices.scale(scalePulse, scalePulse, scalePulse);
matrices.mulPose(new Quaternionf().rotationZ(angleRad * 0.3f));
}
case THROW_CATCH -> {
// el ítem "sube", gira en el aire y "cae" de vuelta
float height = (float) Math.sin(fraction * Math.PI) * 0.35f;
matrices.translate(0f, height, 0f);
matrices.mulPose(new Quaternionf().rotationX(angleRad * 2f));
}
case RANDOM -> {
// no debería llegar aquí, resolveTrick lo reemplaza antes
matrices.mulPose(new Quaternionf().rotationZ(angleRad));
}
}
}
private float easeInOutCubic(float t) {
return t < 0.5f
? 4f * t * t * t
: 1f - (float) Math.pow(-2f * t + 2f, 3) / 2f;
}
private enum TrickType {
SPIN("giro"),
FLIP("voltereta"),
ROLL("balanceo"),
TWIRL("giro doble"),
WAVE("saludo"),
POP("pulso"),
THROW_CATCH("lanzar y coger"),
RANDOM("aleatorio");
private final String name;
TrickType(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum RotateDirection {
CLOCKWISE("sentido horario"),
COUNTER_CLOCKWISE("sentido antihorario");
private final String name;
RotateDirection(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum Hand {
MAIN_HAND("mano principal"),
OFF_HAND("mano secundaria");
private final String name;
Hand(String name) { this.name = name; }
@Override public String toString() { return name; }
}
}
@@ -4,6 +4,8 @@ import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.render.Render3DEvent; import me.retucio.sputnik.event.render.Render3DEvent;
import me.retucio.sputnik.module.Category; import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.camera.Freecam;
import me.retucio.sputnik.module.setting.SettingGroup; import me.retucio.sputnik.module.setting.SettingGroup;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; import me.retucio.sputnik.module.setting.settings.BooleanSetting;
import me.retucio.sputnik.module.setting.settings.ColorSetting; import me.retucio.sputnik.module.setting.settings.ColorSetting;
@@ -46,7 +48,7 @@ public class Tracers extends Module {
private final BooleanSetting self = sgGeneral.add(new BooleanSetting( private final BooleanSetting self = sgGeneral.add(new BooleanSetting(
"uno mismo", "uno mismo",
"apuntarse a uno mismo en cámara libre o así", "apuntarse a uno mismo en cámara libre",
true true
)); ));
@@ -105,6 +107,7 @@ public class Tracers extends Module {
private Color getColor(Entity entity) { private Color getColor(Entity entity) {
if (!entities.isEnabled(entity.getType())) return null; if (!entities.isEnabled(entity.getType())) return null;
if (!self.getValue() && mc.player == entity) return null; if (!self.getValue() && mc.player == entity) return null;
if (self.getValue() && mc.player == entity && !ModuleManager.INSTANCE.getModuleByClass(Freecam.class).isEnabled()) return null;
if (entity instanceof Player) return playerColor.getValue(); if (entity instanceof Player) return playerColor.getValue();
return switch (entity.getType().getCategory()) { return switch (entity.getType().getCategory()) {
@@ -0,0 +1,484 @@
package me.retucio.sputnik.module.modules.world;
import com.github.retucio.neutrino.EventListener;
import me.retucio.sputnik.event.input.MouseClickEvent;
import me.retucio.sputnik.event.interact.AttackBlockEvent;
import me.retucio.sputnik.event.network.PacketEvent;
import me.retucio.sputnik.event.render.Render3DEvent;
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.ColorSetting;
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.ChatUtil;
import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.Lists;
import me.retucio.sputnik.util.MiscUtil;
import me.retucio.sputnik.util.RotationUtil;
import me.retucio.sputnik.util.render.RenderUtil;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
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.ClipContext;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.lwjgl.glfw.GLFW;
import java.awt.*;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class AutoMine extends Module {
private final SettingGroup sgBlocks = addSg(new SettingGroup("bloques", true));
private final SettingGroup sgRender = addSg(new SettingGroup("renderizado", true));
private final EnumSetting<SelectionMode> mode = sgGeneral.add(new EnumSetting<>(
"modo de selección",
"cómo seleccionar los bloques a minar",
SelectionMode.class,
SelectionMode.INDIVIDUAL
));
private final NumberSetting maxBlocks = sgGeneral.add(new NumberSetting(
"límite de bloques",
"cantidad máxima de bloques a seleccionar de una vez (caja / flood)",
256,
1,
4096,
1
));
private final NumberSetting retryTime = sgGeneral.add(new NumberSetting(
"delay",
"delay entre reintentos de minado",
30,
0,
1000,
1
));
private final BooleanSetting cancelOutOfReach = sgGeneral.add(new BooleanSetting(
"cancelar fuera de alcance",
"cancelar aquellos paquetes que intenten romper bloques fuera del alcance del jugador",
true
));
private final BooleanSetting autoTool = sgGeneral.add(new BooleanSetting(
"auto herramienta",
"cambiar automáticamente a la herramienta más rápida antes de minar cada bloque",
true
));
private final BooleanSetting dontBreak = sgGeneral.add(new BooleanSetting(
"no romper pico",
"evita romper la herramienta seleccionada",
true
));
private final EnumSetting<RotateMode> rotate = sgGeneral.add(new EnumSetting<>(
"rotar",
"rotar al minar bloques mediante el módulo",
RotateMode.class, RotateMode.NONE
));
private final NumberSetting packetLimiter = sgGeneral.add(new NumberSetting(
"limitar paquetes",
"limita la cantidad de paquetes enviados en un segundo (0 para desactivar)",
15000, 0, 30000, 100
));
private final ListSetting<Block> blacklist = sgBlocks.add(new ListSetting<>(
"lista negra",
"bloques a excluir de la selección",
Lists.blockList,
Lists.allFalse(Lists.blockList),
Lists.blockNames
));
private final BooleanSetting render = sgRender.add(new BooleanSetting(
"renderizar",
"renderizar un contorno alrededor de los bloques que están siendo minados",
true
));
private final ColorSetting color = sgRender.add(new ColorSetting(
"color",
"color del contorno renderizado",
new Color(0, 255, 0, 100),
false
));
private final ColorSetting pendingColor = sgRender.add(new ColorSetting(
"color de selección pendiente",
"color del contorno de la primera esquina, en modo caja, mientras se espera la segunda",
new Color(255, 255, 0, 100),
false
));
private final NumberSetting lineWidth = sgRender.add(new NumberSetting(
"grosor",
"grosor de las líneas del contorno",
2,
0.1,
10,
0.1
));
private final List<MiningBlock> miningBlocks = new ArrayList<>();
private BlockPos pendingCorner = null;
private int packetCount = 0;
private int tickCount = 0;
public AutoMine() {
super(
"auto minado",
"selecciona un área o bloques individuales para minarlos automáticamente",
Category.WORLD
);
render.onUpdate(v -> {
color.visibility(v);
pendingColor.visibility(v);
lineWidth.visibility(v);
});
}
@Override
public void onDisable() {
miningBlocks.clear();
pendingCorner = null;
packetCount = 0;
tickCount = 0;
super.onDisable();
}
@Override
public void onTick() {
if (mc.player == null || mc.level == null || mc.gameMode == null) return;
tickCount++;
if (tickCount % 20 == 0) {
tickCount = 0;
packetCount = 0;
}
if (miningBlocks.isEmpty()) return;
// se limpian bloques ya rotos, o que fueron blacklisteados después de seleccionarse
Iterator<MiningBlock> iterator = miningBlocks.iterator();
while (iterator.hasNext()) {
MiningBlock block = iterator.next();
BlockState state = mc.level.getBlockState(block.pos);
if (state.isAir() || blacklist.isEnabled(state.getBlock())) {
iterator.remove();
}
}
for (MiningBlock block : miningBlocks) {
processBlock(block);
}
}
@EventListener
private void onClick(MouseClickEvent event) {
if (mc.gui.screen() != null) return;
if (mc.level == null || mc.hitResult == null) return;
if (event.getAction() != GLFW.GLFW_PRESS) return;
if (event.getButton() != GLFW.GLFW_MOUSE_BUTTON_1) return;
BlockHitResult bhr;
if (mc.hitResult.getType() == HitResult.Type.BLOCK) {
bhr = (BlockHitResult) mc.hitResult;
} else {
return;
}
event.cancel();
BlockPos pos = bhr.getBlockPos();
Direction dir = bhr.getDirection();
Block block = mc.level.getBlockState(pos).getBlock();
// clicar un bloque ya seleccionado lo quita de la selección, sea cual sea el modo
MiningBlock existing = getMiningBlock(pos);
if (existing != null) {
miningBlocks.remove(existing);
return;
}
if (blacklist.isEnabled(block)) {
ChatUtil.warn(Component.translatable("sputnik.module.autominado.blacklisted"));
return;
}
switch (mode.getValue()) {
case INDIVIDUAL -> tryAddBlock(pos, dir);
case BOX -> handleBoxSelection(pos, dir);
case FLOOD_FILL -> handleFloodFill(pos, dir);
}
}
@EventListener
private void onRenderWorld(Render3DEvent event) {
if (!render.getValue()) return;
for (MiningBlock block : miningBlocks) {
block.render(event);
}
if (pendingCorner != null) {
renderOutline(event, pendingCorner, pendingColor.getValue());
}
}
@EventListener
private void onPacketSend(PacketEvent.Send event) {
if (packetLimiter.getValue() <= 0) return;
if (packetCount > packetLimiter.getIntValue()) {
event.cancel();
return;
}
packetCount++;
}
private void handleBoxSelection(BlockPos pos, Direction dir) {
if (pendingCorner == null) {
pendingCorner = pos;
ChatUtil.info(Component.translatable("sputnik.module.autominado.cornerselected"));
return;
}
BlockPos corner1 = pendingCorner;
BlockPos corner2 = pos;
pendingCorner = null;
int minX = Math.min(corner1.getX(), corner2.getX());
int maxX = Math.max(corner1.getX(), corner2.getX());
int minY = Math.min(corner1.getY(), corner2.getY());
int maxY = Math.max(corner1.getY(), corner2.getY());
int minZ = Math.min(corner1.getZ(), corner2.getZ());
int maxZ = Math.max(corner1.getZ(), corner2.getZ());
int added = 0;
int limit = maxBlocks.getIntValue();
outer:
for (int x = minX; x <= maxX; x++) {
for (int y = minY; y <= maxY; y++) {
for (int z = minZ; z <= maxZ; z++) {
if (added >= limit) break outer;
if (tryAddBlock(new BlockPos(x, y, z), dir)) added++;
}
}
}
ChatUtil.info(Component.translatable("sputnik.module.autominado.boxselected", added));
}
private void handleFloodFill(BlockPos origin, Direction dir) {
if (mc.level == null) return;
Block target = mc.level.getBlockState(origin).getBlock();
Set<BlockPos> visited = new HashSet<>();
Deque<BlockPos> queue = new ArrayDeque<>();
queue.add(origin);
visited.add(origin);
int added = 0;
int limit = maxBlocks.getIntValue();
while (!queue.isEmpty() && added < limit) {
BlockPos current = queue.poll();
if (mc.level.getBlockState(current).getBlock() != target) continue;
if (tryAddBlock(current, dir)) added++;
for (Direction d : Direction.values()) {
BlockPos neighbor = current.relative(d);
if (visited.contains(neighbor)) continue;
visited.add(neighbor);
if (mc.level.getBlockState(neighbor).getBlock() == target) {
queue.add(neighbor);
}
}
}
ChatUtil.info(Component.translatable("sputnik.module.autominado.floodfilled", added));
}
// false si el bloque no se pudo (o no debía) agregar: aire, ya seleccionado o en la lista negra
private boolean tryAddBlock(BlockPos pos, Direction dir) {
if (mc.level == null) return false;
if (mc.level.getBlockState(pos).isAir()) return false;
if (getMiningBlock(pos) != null) return false;
if (blacklist.isEnabled(mc.level.getBlockState(pos).getBlock())) return false;
miningBlocks.add(new MiningBlock(pos, dir));
return true;
}
private boolean processBlock(MiningBlock block) {
if (mc.level.getBlockState(block.pos).isAir()) return false;
if (!block.mining) {
return block.mine();
} else if (block.shouldRetry()) {
block.startTime = System.currentTimeMillis();
block.mining = false;
return block.mine();
}
return false;
}
private MiningBlock getMiningBlock(BlockPos pos) {
for (MiningBlock block : miningBlocks) {
if (block.pos.equals(pos)) return block;
}
return null;
}
// básicamente AutoTool::selectFastestTool, pero apuntado a un bloque puntual en vez del raycast bajo la mira
private void switchToBestTool(BlockPos pos) {
if (mc.player == null || mc.level == null) return;
BlockState state = mc.level.getBlockState(pos);
List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL));
Map<Float, ItemStack> speeds = new HashMap<>();
for (ItemStack tool : tools) {
int slot = mc.player.getInventory().findSlotMatchingItem(tool);
if (!Inventory.isHotbarSlot(slot)) continue;
Tool toolComponent = tool.get(DataComponents.TOOL);
if (toolComponent != null) {
speeds.put(toolComponent.getMiningSpeed(state), tool);
}
}
if (speeds.isEmpty()) return;
Float fastestSpeed = MiscUtil.getHighest(speeds.keySet().stream().toList());
ItemStack fastestTool = speeds.get(fastestSpeed);
int slot = mc.player.getInventory().findSlotMatchingItem(fastestTool);
if (slot != -1) mc.player.getInventory().setSelectedSlot(slot);
}
private void renderOutline(Render3DEvent event, BlockPos pos, Color renderColor) {
VoxelShape shape = mc.level.getBlockState(pos).getShape(mc.level, pos);
if (shape.isEmpty()) return;
RenderUtil.drawVoxelShapeOutline(
event.getMatrices(),
shape,
pos,
renderColor,
lineWidth.getFloatValue(),
false
);
}
private RotationUtil.Mode getRotationMode() {
return switch (rotate.getValue()) {
case CLIENT, BOTH -> RotationUtil.Mode.CLIENT;
case SERVER -> RotationUtil.Mode.SILENT;
case NONE -> null;
};
}
private class MiningBlock {
BlockPos pos;
Direction dir;
boolean mining = false;
long startTime;
public MiningBlock(BlockPos pos, Direction dir) {
this.pos = pos;
this.dir = dir;
this.startTime = System.currentTimeMillis();
}
public boolean mine() {
if (cancelOutOfReach.getValue()
&& mc.player.position().distanceToSqr(Vec3.atLowerCornerOf(pos)) > Math.pow(mc.player.blockInteractionRange(), 2)) {
return false;
}
if (dontBreak.getValue()
&& mc.player.isHolding(ItemStack::isDamageableItem)
&& mc.player.getMainHandItem().getMaxDamage() - mc.player.getMainHandItem().getDamageValue() <= 1) {
ChatUtil.warn(Component.translatable("sputnik.module.autominado.pickbreaking"));
toggle();
return false;
}
if (autoTool.getValue()) {
switchToBestTool(pos);
}
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);
mining = true;
return true;
}
public void render(Render3DEvent event) {
renderOutline(event, pos, color.getValue());
}
public boolean shouldRetry() {
return mining && (System.currentTimeMillis() - startTime >= retryTime.getValue());
}
}
private enum SelectionMode {
INDIVIDUAL("individual"),
BOX("caja"),
FLOOD_FILL("inundación");
private final String name;
SelectionMode(String name) { this.name = name; }
@Override public String toString() { return name; }
}
private enum RotateMode {
CLIENT("cámara"),
SERVER("mediante paquetes"),
BOTH("ambos"),
NONE("no");
private final String name;
RotateMode(String name) { this.name = name; }
@Override public String toString() { return name; }
}
}
@@ -6,12 +6,14 @@ import me.retucio.sputnik.event.input.MouseClickEvent;
import me.retucio.sputnik.module.Category; import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.settings.BooleanSetting; 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.module.setting.settings.NumberSetting;
import me.retucio.sputnik.util.InventoryUtil; import me.retucio.sputnik.util.InventoryUtil;
import me.retucio.sputnik.util.KeyUtil; import me.retucio.sputnik.util.KeyUtil;
import me.retucio.sputnik.util.MiscUtil; import me.retucio.sputnik.util.MiscUtil;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.Tool; import net.minecraft.world.item.component.Tool;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
@@ -26,6 +28,11 @@ import java.util.Map;
public class AutoTool extends Module { 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( private final NumberSetting delaySetting = sgGeneral.add(new NumberSetting(
"delay", "delay",
"delay al cambiar de herramienta", "delay al cambiar de herramienta",
@@ -86,6 +93,11 @@ public class AutoTool extends Module {
@Override @Override
public void onTick() { public void onTick() {
if (mc.player == null) return; 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) { if (startedMining && delaySetting.getIntValue() > 0) {
delay++; delay++;
@@ -165,10 +177,12 @@ public class AutoTool extends Module {
BlockState state = mc.level.getBlockState(bhr.getBlockPos()); BlockState state = mc.level.getBlockState(bhr.getBlockPos());
List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL)); List<ItemStack> tools = InventoryUtil.findAllStacks(stack -> stack.has(DataComponents.TOOL));
if (tools.isEmpty()) return;
Map<Float, ItemStack> speeds = new HashMap<>(); Map<Float, ItemStack> speeds = new HashMap<>();
for (ItemStack tool : tools) { 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); Tool toolComponent = tool.get(DataComponents.TOOL);
if (toolComponent != null) { if (toolComponent != null) {
speeds.put(toolComponent.getMiningSpeed(state), tool); speeds.put(toolComponent.getMiningSpeed(state), tool);
@@ -193,4 +207,13 @@ public class AutoTool extends Module {
finishedMining = false; finishedMining = false;
switchBackDelay = 0; 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; }
}
} }
@@ -143,7 +143,8 @@ public abstract class Setting<T> {
public void fireUpdateEvent() { public void fireUpdateEvent() {
Sputnik.EVENT_BUS.post( Sputnik.EVENT_BUS.post(
new UpdateSettingEvent(this, getModule().shouldSaveSettings())); new UpdateSettingEvent(this, getModule().shouldSaveSettings())
);
} }
public void onUpdate(Consumer<T> listener) { public void onUpdate(Consumer<T> listener) {
@@ -223,7 +223,7 @@ public class ColorSetting extends Setting<Color> {
return defaultRainbowSpeed; return defaultRainbowSpeed;
} }
public int getRGB() { public int getRgb() {
return getValue().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
));
}
}
}
}
@@ -4,22 +4,31 @@ import me.retucio.sputnik.module.setting.Setting;
import me.retucio.sputnik.util.I18nUtil; import me.retucio.sputnik.util.I18nUtil;
import java.util.*; import java.util.*;
import java.util.function.Supplier;
public class ListSetting<T> extends Setting<Map<T, Boolean>> { public class ListSetting<T> extends Setting<Map<T, Boolean>> {
private final List<T> options; private List<T> options;
private Map<T, String> displayNames = null; private Map<T, String> displayNames = null;
private final Supplier<List<T>> optionsSupplier;
private final Supplier<Map<T, Boolean>> initialValuesSupplier;
private final Supplier<Map<T, String>> displayNamesSupplier;
private boolean resolved;
public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues) { public ListSetting(String name, String description, List<T> options, Map<T, Boolean> initialValues) {
super(name, description, initialValues); super(name, description, new HashMap<>());
this.optionsSupplier = null;
this.initialValuesSupplier = null;
this.displayNamesSupplier = null;
this.resolved = true;
this.options = new ArrayList<>(options); this.options = new ArrayList<>(options);
this.defaultValue = new HashMap<>(); this.defaultValue = new HashMap<>();
for (T option : options) { for (T option : options) {
boolean enabled = initialValues != null && initialValues.getOrDefault(option, false); boolean enabled = initialValues != null && initialValues.getOrDefault(option, false);
defaultValue.put(option, enabled); defaultValue.put(option, enabled);
} }
this.value = new HashMap<>(defaultValue); this.value = new HashMap<>(defaultValue);
} }
@@ -28,11 +37,65 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
this.displayNames = displayNames; this.displayNames = displayNames;
} }
// constructor "lazy": para listas que no están listas (no pun intended) al momento de construirlas
public ListSetting(String name, String description,
Supplier<List<T>> optionsSupplier,
Supplier<Map<T, Boolean>> initialValuesSupplier,
Supplier<Map<T, String>> displayNamesSupplier
) {
super(name, description, new HashMap<>());
this.optionsSupplier = optionsSupplier;
this.initialValuesSupplier = initialValuesSupplier;
this.displayNamesSupplier = displayNamesSupplier;
this.resolved = false;
this.options = new ArrayList<>();
this.defaultValue = new HashMap<>();
this.value = new HashMap<>();
}
// resuelve la lista real la primera vez que se necesita
private void resolveIfNeeded() {
if (resolved || optionsSupplier == null) return;
resolved = true;
List<T> resolvedOptions = optionsSupplier.get();
if (resolvedOptions == null) resolvedOptions = new ArrayList<>();
Map<T, Boolean> resolvedInitial = initialValuesSupplier != null ? initialValuesSupplier.get() : null;
Map<T, Boolean> previousValue = this.value;
this.options = new ArrayList<>(resolvedOptions);
this.defaultValue = new HashMap<>();
for (T option : resolvedOptions) {
boolean enabled = resolvedInitial != null && resolvedInitial.getOrDefault(option, false);
defaultValue.put(option, enabled);
}
this.value = new HashMap<>(defaultValue);
// preservar cualquier valor ya aplicado (p. ej. por ConfigManager) antes del resolve
if (previousValue != null) {
for (Map.Entry<T, Boolean> entry : previousValue.entrySet()) {
if (this.value.containsKey(entry.getKey())) {
this.value.put(entry.getKey(), entry.getValue());
}
}
}
if (displayNamesSupplier != null) {
this.displayNames = displayNamesSupplier.get();
}
}
public boolean isEnabled(T option) { public boolean isEnabled(T option) {
resolveIfNeeded();
return value.getOrDefault(option, false); return value.getOrDefault(option, false);
} }
public void setEnabled(T option, boolean enabled) { public void setEnabled(T option, boolean enabled) {
resolveIfNeeded();
if (value.containsKey(option) && value.get(option) != enabled) { if (value.containsKey(option) && value.get(option) != enabled) {
value.put(option, enabled); value.put(option, enabled);
fireUpdateEvent(); fireUpdateEvent();
@@ -45,22 +108,26 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public Map<T, Boolean> getValues() { public Map<T, Boolean> getValues() {
resolveIfNeeded();
return new HashMap<>(value); return new HashMap<>(value);
} }
@Override @Override
public void setValue(Map<T, Boolean> values) { public void setValue(Map<T, Boolean> values) {
resolveIfNeeded();
if (!this.value.equals(values)) { if (!this.value.equals(values)) {
super.setValue(values); super.setValue(values);
} }
} }
public void setDefaultValue(Map<T, Boolean> values) { public void setDefaultValue(Map<T, Boolean> values) {
resolveIfNeeded();
defaultValue.clear(); defaultValue.clear();
defaultValue.putAll(values); defaultValue.putAll(values);
} }
public Map<String, Boolean> getConfigValues() { public Map<String, Boolean> getConfigValues() {
resolveIfNeeded();
Map<String, Boolean> configValues = new HashMap<>(); Map<String, Boolean> configValues = new HashMap<>();
for (T option : options) { for (T option : options) {
configValues.put(getConfigName(option), value.getOrDefault(option, false)); configValues.put(getConfigName(option), value.getOrDefault(option, false));
@@ -69,16 +136,17 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public void addOption(T option, boolean isDefault, String displayName) { public void addOption(T option, boolean isDefault, String displayName) {
resolveIfNeeded();
options.add(option); options.add(option);
defaultValue.put(option, isDefault); defaultValue.put(option, isDefault);
value.put(option, isDefault); value.put(option, isDefault);
if (this.displayNames != null) { if (this.displayNames != null) {
this.displayNames.put(option, displayName); this.displayNames.put(option, displayName);
} }
} }
public void setAll(boolean enabled) { public void setAll(boolean enabled) {
resolveIfNeeded();
for (T option : options) { for (T option : options) {
value.put(option, enabled); value.put(option, enabled);
} }
@@ -87,10 +155,12 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public List<T> getOptions() { public List<T> getOptions() {
resolveIfNeeded();
return Collections.unmodifiableList(options); return Collections.unmodifiableList(options);
} }
public List<T> getEnabledOptions() { public List<T> getEnabledOptions() {
resolveIfNeeded();
List<T> enabledOptions = new ArrayList<>(); List<T> enabledOptions = new ArrayList<>();
for (T option : options) { for (T option : options) {
if (isEnabled(option)) { if (isEnabled(option)) {
@@ -101,21 +171,18 @@ public class ListSetting<T> extends Setting<Map<T, Boolean>> {
} }
public Map<T, String> getDisplayNames() { public Map<T, String> getDisplayNames() {
resolveIfNeeded();
return displayNames != null ? new HashMap<>(displayNames) : null; return displayNames != null ? new HashMap<>(displayNames) : null;
} }
// OJO: nombre interno de la opción. es la clave de la config. (ver
// ConfigManager#applyListSetting) y para las listas del juego es la clave de
// traducción ("entity.minecraft.zombie"), que no depende del idioma. no traducir
public String getConfigName(T key) { public String getConfigName(T key) {
resolveIfNeeded();
if (displayNames != null && displayNames.containsKey(key)) { if (displayNames != null && displayNames.containsKey(key)) {
return displayNames.get(key); return displayNames.get(key);
} }
return key != null ? key.toString() : "?"; return key != null ? key.toString() : "?";
} }
// nombre visible: se traduce aquí. antes se mostraba el nombre interno tal cual, o sea
// los nombres de vanilla en inglés aunque el juego estuviera en otro idioma
public String getDisplayName(T key) { public String getDisplayName(T key) {
String name = getConfigName(key); String name = getConfigName(key);
return I18nUtil.orElse(name, name); return I18nUtil.orElse(name, name);
@@ -88,9 +88,7 @@ public class OptionSetting<T> extends Setting<T> {
return displayNames; return displayNames;
} }
// OJO: nombre interno de la opción, o sea la clave de la config. (ver ClientConfig // no traducir.
// #onUpdateSetting). igual que en ListSetting, para las listas del juego es la clave
// de traducción. no traducir
public String getConfigName(T key) { public String getConfigName(T key) {
if (displayNames != null && displayNames.containsKey(key)) return displayNames.get(key); if (displayNames != null && displayNames.containsKey(key)) return displayNames.get(key);
return key != null ? key.toString() : "?"; return key != null ? key.toString() : "?";
@@ -36,38 +36,46 @@ public class HudRenderer {
Map<String, int[]> positions = ConfigManager.INSTANCE.getConfig().hudPositions; Map<String, int[]> positions = ConfigManager.INSTANCE.getConfig().hudPositions;
Map<String, Boolean> visibilities = ConfigManager.INSTANCE.getConfig().hudVisibilities; Map<String, Boolean> visibilities = ConfigManager.INSTANCE.getConfig().hudVisibilities;
addElement(new CoordsElement(), positions, visibilities); addElement(new CoordsElement(), positions, visibilities, true);
addElement(new FpsElement(), positions, visibilities); addElement(new FpsElement(), positions, visibilities, true);
addElement(new TpsElement(), positions, visibilities); addElement(new TpsElement(), positions, visibilities, false);
addElement(new CustomTextElement(), positions, visibilities); addElement(new CustomTextElement(), positions, visibilities, false);
addElement(new PingElement(), positions, visibilities); addElement(new PingElement(), positions, visibilities, true);
addElement(new RotationElement(), positions, visibilities); addElement(new RotationElement(), positions, visibilities, false);
addElement(new TimeElement(), positions, visibilities); addElement(new TimeElement(), positions, visibilities, true);
addElement(new UptimeElement(), positions, visibilities); 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 DynoElement(), positions, visibilities, false);
addElement(new EchestElement(), positions, visibilities); addElement(new EchestElement(), positions, visibilities, false);
addElement(new TotemsElement(), positions, visibilities); addElement(new TotemsElement(), positions, visibilities, true);
addElement(new ArmorElement(), positions, visibilities); addElement(new ArmorElement(), positions, visibilities, true);
addElement(new CustomImageElement(), positions, visibilities, false);
HudEditor.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; int[] savedPos;
if (positions.get(element.getId()) == null) if (positions.get(element.getId()) == null) {
savedPos = new int[] {element.defaultX, element.defaultY}; savedPos = new int[] {element.defaultX, element.defaultY};
else } else {
savedPos = positions.get(element.getId()); savedPos = positions.get(element.getId());
}
Boolean savedVisibility = visibilities.get(element.getId()); Boolean savedVisibility = visibilities.get(element.getId());
if (savedPos != null) if (savedPos != null) {
element.setPosition(savedPos[0], savedPos[1]); element.setPosition(savedPos[0], savedPos[1]);
}
if (savedVisibility != null) if (savedVisibility != null) {
element.setVisible(savedVisibility); element.setVisible(savedVisibility);
} else {
element.setVisible(defVisible);
}
elements.add(element); elements.add(element);
} }
@@ -3,6 +3,7 @@ package me.retucio.sputnik.ui.hud;
import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.platform.NativeImage;
import me.retucio.sputnik.Sputnik; import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.module.modules.client.Hud; import me.retucio.sputnik.module.modules.client.Hud;
import me.retucio.sputnik.util.ChatUtil;
import me.retucio.sputnik.util.Colors; import me.retucio.sputnik.util.Colors;
import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.renderer.RenderPipelines;
@@ -35,7 +36,9 @@ public abstract class ImageHudElement extends HudElement {
public void reloadTexture() { public void reloadTexture() {
textureLoaded = false; textureLoaded = false;
String imagePath = getImagePath(); String imagePath = getImagePath();
if (imagePath == null || imagePath.isEmpty()) return; if (imagePath == null || imagePath.isEmpty()) {
return;
}
try { try {
// cargar // cargar
@@ -65,12 +68,18 @@ public abstract class ImageHudElement extends HudElement {
} }
} catch (Exception e) { } catch (Exception e) {
Sputnik.LOGGER.error(Component.translatable("sputnik.hud.error.texture", getId(), e.getMessage()).getString()); Sputnik.LOGGER.error(Component.translatable("sputnik.hud.error.texture", getId(), e.getMessage()).getString());
e.printStackTrace();
} }
} }
@Override @Override
public void renderInGame(GuiGraphicsExtractor gui, float delta, Hud hud) { 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( gui.blit(
RenderPipelines.GUI_TEXTURED, RenderPipelines.GUI_TEXTURED,
@@ -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")
);
}
}
@@ -0,0 +1,84 @@
package me.retucio.sputnik.ui.hud.elements;
import me.retucio.sputnik.Sputnik;
import me.retucio.sputnik.module.ModuleManager;
import me.retucio.sputnik.module.modules.client.Hud;
import me.retucio.sputnik.ui.hud.ImageHudElement;
import com.mojang.blaze3d.platform.NativeImage;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.network.chat.Component;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.List;
import java.util.function.Supplier;
public class CustomImageElement extends ImageHudElement {
public CustomImageElement() {
super("customimage", 200, 200);
reloadTexture();
}
@Override
protected String getImagePath() {
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
if (hud != null && hud.customImagePath != null && !hud.customImagePath.getValue().isEmpty()) {
return hud.customImagePath.getValue();
}
return "";
}
@Override
public void reloadTexture() {
textureLoaded = false;
String imagePath = getImagePath();
if (imagePath == null || imagePath.isEmpty()) {
return;
}
File file = new File(imagePath);
if (!file.exists() || !file.isFile()) {
Sputnik.LOGGER.error(Component.translatable(
"sputnik.hud.error.texture", getId(), "file not found: " + imagePath).getString()
);
return;
}
try (InputStream stream = new FileInputStream(file)) {
NativeImage image = NativeImage.read(stream);
if (texture != null) texture.close();
mc.getTextureManager().getTexture(textureId);
mc.getTextureManager().release(textureId);
Supplier<String> nameSupplier = () -> textureId.toString();
texture = new DynamicTexture(nameSupplier, image);
this.imageWidth = image.getWidth();
this.imageHeight = image.getHeight();
this.w = imageWidth;
this.h = imageHeight;
mc.getTextureManager().register(textureId, texture);
textureLoaded = true;
Sputnik.LOGGER.info(Component.translatable("sputnik.hud.info.textureloaded", getId()).getString());
} catch (Exception e) {
Sputnik.LOGGER.error(Component.translatable(
"sputnik.hud.error.texture", getId(), e.getMessage()).getString()
);
}
}
@Override
public List<Component> getTooltip() {
return List.of(
Component.translatable("sputnik.hud.element.customimage.name"),
Component.translatable("sputnik.hud.element.customimage.desc")
);
}
}
@@ -23,8 +23,9 @@ public class CustomTextElement extends TextHudElement {
@Override @Override
public String getPreviewText() { public String getPreviewText() {
Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class); Hud hud = ModuleManager.INSTANCE.getModuleByClass(Hud.class);
if (hud != null && hud.customText != null && !hud.customText.getValue().isEmpty()) if (hud != null && hud.customText != null && !hud.customText.getValue().isEmpty()) {
return hud.customText.getValue(); return hud.customText.getValue();
}
return "texto custom"; return "texto custom";
} }
@@ -0,0 +1,50 @@
package me.retucio.sputnik.ui.hud.elements;
import me.retucio.sputnik.module.modules.client.Hud;
import me.retucio.sputnik.ui.hud.TextHudElement;
import net.minecraft.network.chat.Component;
import net.minecraft.util.Mth;
import java.util.List;
public class SpeedElement extends TextHudElement {
public SpeedElement() {
super("velocidad", 0, (mc.getWindow().getGuiScaledHeight() - mc.font.lineHeight) / 2);
}
@Override
public String getText(float delta, Hud hud) {
if (mc.player == null) return getPreviewText();
String unit = hud.speedUnit.getValue().getSymbol();
// solo velocidad horizontal
float speed = Mth.sqrt(
(float) (mc.player.getDeltaMovement().x() * mc.player.getDeltaMovement().x())
+ (float) (mc.player.getDeltaMovement().z() * mc.player.getDeltaMovement().z())
);
if (hud.speedUnit.is(Hud.SpeedUnits.BPS)) {
speed = speed * 20;
} else if (hud.speedUnit.is(Hud.SpeedUnits.KBPH)) {
speed = speed * 20 * 3600 / 1000;
}
return String.format("%.2f %s", speed, unit);
}
@Override
public String getPreviewText() {
return "0 b/s";
}
@Override
public List<Component> getTooltip() {
return List.of(
Component.translatable("sputnik.hud.elementos.velocidad.name"),
Component.translatable("sputnik.hud.elementos.velocidad.desc")
);
}
}
@@ -12,11 +12,10 @@ import me.retucio.sputnik.module.Category;
import me.retucio.sputnik.module.Module; import me.retucio.sputnik.module.Module;
import me.retucio.sputnik.module.setting.Setting; import me.retucio.sputnik.module.setting.Setting;
import me.retucio.sputnik.module.setting.settings.ColorSetting; import me.retucio.sputnik.module.setting.settings.ColorSetting;
import me.retucio.sputnik.ui.widgets.buttons.FriendButton; import me.retucio.sputnik.ui.screen.tabs.FriendsTab;
import me.retucio.sputnik.ui.widgets.buttons.settings.ListButton; import me.retucio.sputnik.ui.widgets.buttons.settings.ListButton;
import me.retucio.sputnik.ui.widgets.buttons.ModuleButton; import me.retucio.sputnik.ui.widgets.buttons.ModuleButton;
import me.retucio.sputnik.ui.widgets.buttons.SettingButton; import me.retucio.sputnik.ui.widgets.buttons.SettingButton;
import me.retucio.sputnik.ui.widgets.panels.FriendsPanel;
import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ClientSettingsPanel;
import me.retucio.sputnik.ui.widgets.panels.settings.ColorPickerPanel; import me.retucio.sputnik.ui.widgets.panels.settings.ColorPickerPanel;
import me.retucio.sputnik.ui.widgets.panels.ModulePanel; import me.retucio.sputnik.ui.widgets.panels.ModulePanel;
@@ -31,7 +30,6 @@ import me.retucio.sputnik.ui.widgets.misc.ScrollBarWidget;
import me.retucio.sputnik.ui.widgets.misc.SearchBarWidget; import me.retucio.sputnik.ui.widgets.misc.SearchBarWidget;
import me.retucio.sputnik.ui.widgets.misc.TabBarWidget; import me.retucio.sputnik.ui.widgets.misc.TabBarWidget;
import me.retucio.sputnik.util.Colors; import me.retucio.sputnik.util.Colors;
import me.retucio.sputnik.ui.widgets.panels.settings.FriendSettingsPanel;
import me.retucio.sputnik.util.KeyUtil; import me.retucio.sputnik.util.KeyUtil;
import me.retucio.sputnik.util.MiscUtil; import me.retucio.sputnik.util.MiscUtil;
@@ -69,7 +67,6 @@ public class ClickGui extends Screen {
private final List<ModulePanel> modulePanels = new ArrayList<>(); private final List<ModulePanel> modulePanels = new ArrayList<>();
private final List<SettingsPanel> settingsPanels = new ArrayList<>(); private final List<SettingsPanel> settingsPanels = new ArrayList<>();
private final ClientSettingsPanel clientSettingsPanel = new ClientSettingsPanel(620, 280, 100, 20); private final ClientSettingsPanel clientSettingsPanel = new ClientSettingsPanel(620, 280, 100, 20);
private final FriendsPanel friendsPanel = new FriendsPanel(40, 280, 100, 20);
private final ScrollBarWidget scrollBar = new ScrollBarWidget(); private final ScrollBarWidget scrollBar = new ScrollBarWidget();
private final SearchBarWidget searchBar = new SearchBarWidget(320, 10, 320, 20); private final SearchBarWidget searchBar = new SearchBarWidget(320, 10, 320, 20);
@@ -78,6 +75,9 @@ public class ClickGui extends Screen {
private final TabBarWidget tabBar = new TabBarWidget(this::onTabLeft); private final TabBarWidget tabBar = new TabBarWidget(this::onTabLeft);
private final ProfilesTab profilesTab = new ProfilesTab(); private final ProfilesTab profilesTab = new ProfilesTab();
private final MacrosTab macrosTab = new MacrosTab(); private final MacrosTab macrosTab = new MacrosTab();
private final FriendsTab friendsTab = new FriendsTab();
private static final int PLACEMENT_SEARCH_STEP = 8;
public ClickGui() { public ClickGui() {
super(Component.translatable("sputnik.ui.clickgui.title")); super(Component.translatable("sputnik.ui.clickgui.title"));
@@ -97,6 +97,7 @@ public class ClickGui extends Screen {
case HUD -> renderHud(gui, mouseX, mouseY); case HUD -> renderHud(gui, mouseX, mouseY);
case PROFILES -> profilesTab.render(gui, mouseX, mouseY, delta); case PROFILES -> profilesTab.render(gui, mouseX, mouseY, delta);
case MACROS -> macrosTab.render(gui, mouseX, mouseY, delta); case MACROS -> macrosTab.render(gui, mouseX, mouseY, delta);
case FRIENDS -> friendsTab.render(gui, mouseX, mouseY, delta);
} }
tabBar.render(gui, mouseX, mouseY, delta); tabBar.render(gui, mouseX, mouseY, delta);
@@ -124,7 +125,6 @@ public class ClickGui extends Screen {
searchBar.updatePosition(mouseX, mouseY); searchBar.updatePosition(mouseX, mouseY);
// actualizar la posición de renderizado vertical de los paneles cada tick // actualizar la posición de renderizado vertical de los paneles cada tick
friendsPanel.updateRenderY(scrollOffset);
clientSettingsPanel.updateRenderY(scrollOffset); clientSettingsPanel.updateRenderY(scrollOffset);
for (ModulePanel mp : modulePanels) { for (ModulePanel mp : modulePanels) {
mp.updateRenderY(scrollOffset); mp.updateRenderY(scrollOffset);
@@ -149,9 +149,6 @@ public class ClickGui extends Screen {
sp.drawTooltips(gui, mouseX, mouseY); sp.drawTooltips(gui, mouseX, mouseY);
} }
friendsPanel.render(gui, mouseX, mouseY, delta);
friendsPanel.updatePosition(mouseX, mouseY);
clientSettingsPanel.render(gui, mouseX, mouseY, delta); clientSettingsPanel.render(gui, mouseX, mouseY, delta);
clientSettingsPanel.updatePosition(mouseX, mouseY); clientSettingsPanel.updatePosition(mouseX, mouseY);
@@ -191,10 +188,6 @@ public class ClickGui extends Screen {
bottom = Math.max(bottom, sp.getY() + sp.getH() + sp.getTotalHeight()); bottom = Math.max(bottom, sp.getY() + sp.getH() + sp.getTotalHeight());
} }
int friendsBottom = friendsPanel.getY() + friendsPanel.getH()
+ (friendsPanel.isExtended() ? friendsPanel.getTotalHeight() : 0);
bottom = Math.max(bottom, friendsBottom);
int clientBottom = clientSettingsPanel.getY() + clientSettingsPanel.getH() int clientBottom = clientSettingsPanel.getY() + clientSettingsPanel.getH()
+ (clientSettingsPanel.isExtended() ? clientSettingsPanel.getTotalHeight() : 0); + (clientSettingsPanel.isExtended() ? clientSettingsPanel.getTotalHeight() : 0);
bottom = Math.max(bottom, clientBottom); bottom = Math.max(bottom, clientBottom);
@@ -202,6 +195,46 @@ public class ClickGui extends Screen {
return bottom + 20; // padding return bottom + 20; // padding
} }
private int[] findEmptyPosition(int w, int h, int preferredX, int preferredY) {
int screenWidth = mc.getWindow().getGuiScaledWidth();
int maxX = Math.max(0, screenWidth - w);
int startX = Math.clamp(preferredX, 0, maxX);
int startY = Math.max(preferredY, 0);
int searchBottom = calculateContentHeight() + h;
for (int y = startY; y <= searchBottom; y += PLACEMENT_SEARCH_STEP) {
for (int candidateX = 0; candidateX <= maxX; candidateX += PLACEMENT_SEARCH_STEP) {
if (!overlapsAnything(candidateX, y, w, h)) {
return new int[]{candidateX, y};
}
}
}
// no hay hueco: colocarlo debajo de todo lo demás, para llegar a él haciendo scroll
return new int[]{startX, calculateContentHeight()};
}
private boolean overlapsAnything(int x, int y, int w, int h) {
for (ModulePanel mp : modulePanels) {
int mpHeight = mp.getH() + (mp.isExtended() ? mp.getTotalHeight() : 0);
if (rectsOverlap(x, y, w, h, mp.getX(), mp.getY(), mp.getW(), mpHeight)) return true;
}
for (SettingsPanel sp : settingsPanels) {
int spHeight = sp.getH() + sp.getTotalHeight();
if (rectsOverlap(x, y, w, h, sp.getX(), sp.getY(), sp.getW(), spHeight)) return true;
}
int clientHeight = clientSettingsPanel.getH() + (clientSettingsPanel.isExtended() ? clientSettingsPanel.getTotalHeight() : 0);
return rectsOverlap(x, y, w, h, clientSettingsPanel.getX(), clientSettingsPanel.getY(), clientSettingsPanel.getW(), clientHeight);
}
private boolean rectsOverlap(int ax, int ay, int aw, int ah, int bx, int by, int bw, int bh) {
return ax < bx + bw && ax + aw > bx
&& ay < by + bh && ay + ah > by;
}
@Override @Override
public boolean mouseClicked(MouseButtonEvent click, boolean doubled) { public boolean mouseClicked(MouseButtonEvent click, boolean doubled) {
int x = (int) click.x(); int x = (int) click.x();
@@ -212,8 +245,6 @@ public class ClickGui extends Screen {
switch (tabBar.getSelected()) { switch (tabBar.getSelected()) {
case MODULES -> { case MODULES -> {
miscWidgets.forEach(w -> w.mouseClicked(x, y, click.button())); miscWidgets.forEach(w -> w.mouseClicked(x, y, click.button()));
friendsPanel.mouseClicked(x, y, click.button());
clientSettingsPanel.mouseClicked(x, y, click.button()); clientSettingsPanel.mouseClicked(x, y, click.button());
for (ModulePanel mp : modulePanels.reversed()) { for (ModulePanel mp : modulePanels.reversed()) {
mp.mouseClicked(x, y, click.button()); mp.mouseClicked(x, y, click.button());
@@ -225,6 +256,7 @@ public class ClickGui extends Screen {
case HUD -> HudEditor.INSTANCE.mouseClicked(x, y, click.button()); case HUD -> HudEditor.INSTANCE.mouseClicked(x, y, click.button());
case PROFILES -> profilesTab.mouseClicked(x, y, click.button()); case PROFILES -> profilesTab.mouseClicked(x, y, click.button());
case MACROS -> macrosTab.mouseClicked(x, y, click.button()); case MACROS -> macrosTab.mouseClicked(x, y, click.button());
case FRIENDS -> friendsTab.mouseClicked(x, y, click.button());
} }
return super.mouseClicked(click, doubled); return super.mouseClicked(click, doubled);
@@ -246,7 +278,6 @@ public class ClickGui extends Screen {
x, y, click.button())); x, y, click.button()));
// registrar cuándo se suelta el clic, en cada panel respectivamente // registrar cuándo se suelta el clic, en cada panel respectivamente
friendsPanel.mouseReleased(x, y, click.button());
clientSettingsPanel.mouseReleased(x, y, click.button()); clientSettingsPanel.mouseReleased(x, y, click.button());
for (ModulePanel mp : modulePanels.reversed()) { for (ModulePanel mp : modulePanels.reversed()) {
mp.mouseReleased(x, y, click.button()); mp.mouseReleased(x, y, click.button());
@@ -290,6 +321,7 @@ public class ClickGui extends Screen {
} }
case PROFILES -> profilesTab.onKey(event.getKey(), event.getAction()); case PROFILES -> profilesTab.onKey(event.getKey(), event.getAction());
case MACROS -> macrosTab.onKey(event.getKey(), event.getAction()); case MACROS -> macrosTab.onKey(event.getKey(), event.getAction());
case FRIENDS -> friendsTab.onKey(event.getKey(), event.getAction());
} }
} }
@@ -313,7 +345,6 @@ public class ClickGui extends Screen {
if (correction != 0) { if (correction != 0) {
modulePanels.forEach(mp -> mp.setY(mp.getY() + correction)); modulePanels.forEach(mp -> mp.setY(mp.getY() + correction));
settingsPanels.forEach(sp -> sp.setY(sp.getY() + correction)); settingsPanels.forEach(sp -> sp.setY(sp.getY() + correction));
friendsPanel.setY(friendsPanel.getY() + correction);
clientSettingsPanel.setY(clientSettingsPanel.getY() + correction); clientSettingsPanel.setY(clientSettingsPanel.getY() + correction);
} }
} }
@@ -382,26 +413,6 @@ public class ClickGui extends Screen {
} }
} }
for (Button b : friendsPanel.getButtons()) {
if (!(b instanceof FriendButton fb)) continue;
Friend friend = fb.getFriend();
if (searchInput.isEmpty()) {
friend.setSearchMatch(true);
continue;
}
String name = MiscUtil.removeAccentMarks(friend.getName());
String uuid = MiscUtil.removeAccentMarks(friend.getUuid().toString());
if (!clientSettings.matchCase.getValue()) {
name = name.toLowerCase();
uuid = uuid.toLowerCase();
}
friend.setSearchMatch(name.contains(searchInput) || uuid.contains(searchInput));
}
for (Button b : clientSettingsPanel.getButtons()) { for (Button b : clientSettingsPanel.getButtons()) {
if (!(b instanceof SettingButton<?> sb)) continue; if (!(b instanceof SettingButton<?> sb)) continue;
Setting<?> setting = sb.getSetting(); Setting<?> setting = sb.getSetting();
@@ -433,12 +444,18 @@ public class ClickGui extends Screen {
); );
} }
// abrir un marco donde se encuentran los ajustes del módulo deseado // abrir un marco donde se encuentran los ajustes del módulo deseado, buscando un
// hueco libre cerca de (x, y) para que no se solape con otros paneles ya abiertos
public void openSettingsPanel(Module module, int x, int y) { public void openSettingsPanel(Module module, int x, int y) {
// asegurarse de que no se sale de la pantalla SettingsPanel panel = new SettingsPanel(module, 0, 0, 100, 20);
x = Math.clamp(x, 0, mc.getWindow().getGuiScaledWidth() - 80); panel.updateTotalHeight(); // altura real disponible ya tras el constructor
int panelHeight = panel.getH() + panel.getTotalHeight();
int[] position = findEmptyPosition(panel.getW(), panelHeight, x, y);
panel.setX(position[0]);
panel.setY(position[1]);
SettingsPanel panel = new SettingsPanel(module, x, y, 100, 20);
settingsPanels.add(panel); settingsPanels.add(panel);
Sputnik.EVENT_BUS.post(new SettingsPanelEvent.Open(panel)); Sputnik.EVENT_BUS.post(new SettingsPanelEvent.Open(panel));
@@ -499,33 +516,6 @@ public class ClickGui extends Screen {
} }
} }
public boolean isFriendSettingsPanelOpen(Friend friend) {
for (SettingsPanel sp : getSettingsPanels()) {
if (sp instanceof FriendSettingsPanel fsp) {
if (fsp.getFriend().getUuid().equals(friend.getUuid())) return true;
}
}
return false;
}
public void openFriendSettingsPanel(Friend friend, int x, int y) {
FriendSettingsPanel panel = new FriendSettingsPanel(friend, x + 80, y + 5, 153, 20);
if (isFriendSettingsPanelOpen(friend)) {
closeFriendSettingsPanel(friend);
return;
}
settingsPanels.add(panel);
}
public void closeFriendSettingsPanel(Friend friend) {
for (SettingsPanel sp : getSettingsPanels()) {
if (sp instanceof FriendSettingsPanel fsp && fsp.getFriend().getUuid().equals(friend.getUuid())) {
settingsPanels.remove(fsp);
break;
}
}
}
public void refreshListButtons() { public void refreshListButtons() {
for (SettingsPanel panel : settingsPanels) for (SettingsPanel panel : settingsPanels)
for (Button button : panel.getButtons()) for (Button button : panel.getButtons())
@@ -546,7 +536,8 @@ public class ClickGui extends Screen {
// lo miran Sputnik#onInput y el editor del hud para no tratar las teclas que se están // lo miran Sputnik#onInput y el editor del hud para no tratar las teclas que se están
// escribiendo como atajos de módulos // escribiendo como atajos de módulos
public boolean isCapturingInput() { public boolean isCapturingInput() {
return searchBar.isFocused() || profilesTab.isCapturingInput() || macrosTab.isCapturingInput(); return searchBar.isFocused() || profilesTab.isCapturingInput()
|| macrosTab.isCapturingInput() || friendsTab.isCapturingInput();
} }
public boolean isOnHudTab() { public boolean isOnHudTab() {
@@ -599,7 +590,6 @@ public class ClickGui extends Screen {
public List<ModulePanel> getModulePanels() { return modulePanels; } public List<ModulePanel> getModulePanels() { return modulePanels; }
public List<SettingsPanel> getSettingsPanels() { return settingsPanels; } public List<SettingsPanel> getSettingsPanels() { return settingsPanels; }
public ClientSettingsPanel getClientSettingsPanel() { return clientSettingsPanel; } public ClientSettingsPanel getClientSettingsPanel() { return clientSettingsPanel; }
public FriendsPanel getFriendsPanel() { return friendsPanel; }
public SearchBarWidget getSearchBar() { return searchBar; } public SearchBarWidget getSearchBar() { return searchBar; }
public TabBarWidget getTabBar() { return tabBar; } public TabBarWidget getTabBar() { return tabBar; }
public ScrollBarWidget getScrollBar() { return scrollBar; } public ScrollBarWidget getScrollBar() { return scrollBar; }
Loaded 100 of 116 files, more files were not shown because too many files have changed in this diff. Show more